From e40dcda44ef7b36798b7dabc7be3cdab0bd66639 Mon Sep 17 00:00:00 2001 From: fluffe9911 Date: Fri, 29 Nov 2019 19:24:37 -0500 Subject: [PATCH 1/5] honk --- code/datums/ert.dm | 9 +++++++ code/game/objects/items/cards_ids.dm | 8 ++++++ code/modules/antagonists/ert/ert.dm | 12 ++++++++- code/modules/clothing/outfits/ert.dm | 39 ++++++++++++++++++++++++++-- 4 files changed, 65 insertions(+), 3 deletions(-) diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 7fd7b8c526d8..2af496c1df99 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -62,3 +62,12 @@ rename_team = "Janitor" mission = "Clean up EVERYTHING." polldesc = "a Nanotrasen Janitorial Response Team" + +/datum/ert/clown + roles = list(/datum/antagonist/ert/clown, /datum/antagonist/ert/clown/robust) + leader_role = /datum/antagonist/ert/clown/robust + teamsize = 7 + opendoors = FALSE + rename_team = "Clown Response Team" + mission = "Bring joy and happiness to all the crew the only way a clown can honk!" + polldesc = "a Nanotrasen Clown Response Team" \ No newline at end of file diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 25b821e15c9b..f4d0e7888fbd 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -428,6 +428,14 @@ update_label("John Doe", "Clowny") access = get_all_accesses() . = ..() +/obj/item/card/id/ert/clown + registered_name = "Clown" + assignment = "Clown ERT" + +/obj/item/card/id/ert/clown/Initialize() + access = get_all_accesses() + . = ..() + /obj/item/card/id/prisoner name = "prisoner ID card" desc = "You are a number, you are not a free man." diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 024fcdf5b00c..29a76892b592 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -108,6 +108,16 @@ outfit = /datum/outfit/death_commando role = "Officer" +/datum/antagonist/ert/clown/robust + name = "Clown Commander" + outfit = /datum/outfit/ert/clown/robust + role = "Clown Commander" + +/datum/antagonist/ert/clown + name = "Clown" + outfit = /datum/outfit/ert/clown + role = "Clown" + /datum/antagonist/ert/create_team(datum/team/ert/new_team) if(istype(new_team)) ert_team = new_team @@ -152,4 +162,4 @@ missiondesc += " Follow orders given to you by your squad leader." missiondesc += "
Your Mission : [ert_team.mission.explanation_text]" - to_chat(owner,missiondesc) + to_chat(owner,missiondesc) \ No newline at end of file diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 95db6a95af2a..f10a3638c2a3 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -20,7 +20,7 @@ var/obj/item/card/id/W = H.wear_id W.registered_name = H.real_name W.update_label(W.registered_name, W.assignment) - + H.ignores_capitalism = TRUE // Yogs -- Lets ERTs buy a damned smoke for christ's sake /datum/outfit/ert/commander @@ -193,7 +193,7 @@ W.assignment = "CentCom Official" W.registered_name = H.real_name W.update_label() - + H.ignores_capitalism = TRUE // Yogs -- Lets Centcom guys buy a damned smoke for christ's sake /datum/outfit/ert/commander/inquisitor @@ -304,3 +304,38 @@ /obj/item/clothing/mask/gas/sechailer=1,\ /obj/item/grenade/clusterbuster/cleaner=3) +/datum/outfit/ert/clown + name = "Clown ERT" + id = /obj/item/card/id/ert/clown + belt = /obj/item/pda/clown + ears = /obj/item/radio/headset/headset_cent + uniform = /obj/item/clothing/under/rank/clown + shoes = /obj/item/clothing/shoes/clown_shoes + mask = /obj/item/clothing/mask/gas/clown_hat + l_pocket = /obj/item/bikehorn + r_hand = /obj/item/pneumatic_cannon/pie/selfcharge + backpack_contents = list( + /obj/item/stamp/clown = 1, + /obj/item/reagent_containers/spray/waterflower = 1, + /obj/item/reagent_containers/food/snacks/grown/banana = 1, + /obj/item/instrument/bikehorn = 1, + ) + implants = list(/obj/item/implant/sad_trombone) + backpack = /obj/item/storage/backpack/clown + box = /obj/item/storage/box/hug/survival + chameleon_extras = /obj/item/stamp/clown + +/datum/outfit/ert/clown/robust + name = "Clown ERT Leader" + id = /obj/item/card/id/ert/clown + uniform = /obj/item/clothing/under/rank/clown + shoes = /obj/item/clothing/shoes/clown_shoes + gloves = /obj/item/clothing/gloves/color/black + mask = /obj/item/clothing/mask/gas/clown_hat + ears = /obj/item/radio/headset/headset_cent + glasses = /obj/item/clothing/glasses/thermal/monocle + suit = /obj/item/clothing/suit/hooded/chaplain_hoodie + l_pocket = /obj/item/reagent_containers/food/snacks/grown/banana + r_pocket = /obj/item/bikehorn + r_hand = /obj/item/twohanded/fireaxe + l_hand = /obj/item/pneumatic_cannon/pie/selfcharge \ No newline at end of file From 247af39de804f720817018c2c0da67066785fe62 Mon Sep 17 00:00:00 2001 From: fluffe9911 Date: Fri, 29 Nov 2019 19:47:26 -0500 Subject: [PATCH 2/5] ok --- code/datums/ert.dm | 2 +- code/modules/clothing/outfits/ert.dm | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 2af496c1df99..8226b924f3a9 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -68,6 +68,6 @@ leader_role = /datum/antagonist/ert/clown/robust teamsize = 7 opendoors = FALSE - rename_team = "Clown Response Team" + rename_team = "Honk Squad" mission = "Bring joy and happiness to all the crew the only way a clown can honk!" polldesc = "a Nanotrasen Clown Response Team" \ No newline at end of file diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index f10a3638c2a3..e221777549ba 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -305,7 +305,7 @@ /obj/item/grenade/clusterbuster/cleaner=3) /datum/outfit/ert/clown - name = "Clown ERT" + name = "Honk Squad Clown" id = /obj/item/card/id/ert/clown belt = /obj/item/pda/clown ears = /obj/item/radio/headset/headset_cent @@ -321,12 +321,12 @@ /obj/item/instrument/bikehorn = 1, ) implants = list(/obj/item/implant/sad_trombone) - backpack = /obj/item/storage/backpack/clown + back = /obj/item/storage/backpack/clown box = /obj/item/storage/box/hug/survival chameleon_extras = /obj/item/stamp/clown /datum/outfit/ert/clown/robust - name = "Clown ERT Leader" + name = "Honk Squad Leader" id = /obj/item/card/id/ert/clown uniform = /obj/item/clothing/under/rank/clown shoes = /obj/item/clothing/shoes/clown_shoes @@ -335,6 +335,7 @@ ears = /obj/item/radio/headset/headset_cent glasses = /obj/item/clothing/glasses/thermal/monocle suit = /obj/item/clothing/suit/hooded/chaplain_hoodie + back = /obj/item/storage/backpack/clown l_pocket = /obj/item/reagent_containers/food/snacks/grown/banana r_pocket = /obj/item/bikehorn r_hand = /obj/item/twohanded/fireaxe From cd840a2434f95283d9007e498e94066ecb26b706 Mon Sep 17 00:00:00 2001 From: fluffe9911 Date: Fri, 29 Nov 2019 19:59:17 -0500 Subject: [PATCH 3/5] ok --- code/datums/ert.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 8226b924f3a9..c68399cca655 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -68,6 +68,6 @@ leader_role = /datum/antagonist/ert/clown/robust teamsize = 7 opendoors = FALSE - rename_team = "Honk Squad" + rename_team = "HONK Squad" mission = "Bring joy and happiness to all the crew the only way a clown can honk!" polldesc = "a Nanotrasen Clown Response Team" \ No newline at end of file From d78d4e8aaef52ec34c4a667415a5f1647a1542d5 Mon Sep 17 00:00:00 2001 From: fluffe9911 Date: Sat, 30 Nov 2019 11:03:38 -0500 Subject: [PATCH 4/5] ok --- code/datums/ert.dm | 2 +- code/modules/antagonists/ert/ert.dm | 2 +- code/modules/clothing/outfits/ert.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/ert.dm b/code/datums/ert.dm index c68399cca655..d83357ae3dec 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -69,5 +69,5 @@ teamsize = 7 opendoors = FALSE rename_team = "HONK Squad" - mission = "Bring joy and happiness to all the crew the only way a clown can honk!" + mission = "Bring joy and happiness to all the crew the only way a clown can. honk!" polldesc = "a Nanotrasen Clown Response Team" \ No newline at end of file diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 29a76892b592..80a47b828601 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -110,7 +110,7 @@ /datum/antagonist/ert/clown/robust name = "Clown Commander" - outfit = /datum/outfit/ert/clown/robust + outfit = /datum/outfit/ert/clown/leader role = "Clown Commander" /datum/antagonist/ert/clown diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index e221777549ba..8be9a6c70e62 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -325,7 +325,7 @@ box = /obj/item/storage/box/hug/survival chameleon_extras = /obj/item/stamp/clown -/datum/outfit/ert/clown/robust +/datum/outfit/ert/clown/leader name = "Honk Squad Leader" id = /obj/item/card/id/ert/clown uniform = /obj/item/clothing/under/rank/clown From e856614a42a157b4055fda54034cf86220ac4584 Mon Sep 17 00:00:00 2001 From: fluffe9911 Date: Sun, 1 Dec 2019 17:06:54 -0500 Subject: [PATCH 5/5] ok --- code/datums/ert.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/ert.dm b/code/datums/ert.dm index d83357ae3dec..7fd54ff89b39 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -69,5 +69,5 @@ teamsize = 7 opendoors = FALSE rename_team = "HONK Squad" - mission = "Bring joy and happiness to all the crew the only way a clown can. honk!" - polldesc = "a Nanotrasen Clown Response Team" \ No newline at end of file + mission = "Bring joy and happiness to all the crew the only way a clown can. Honk!" + polldesc = "a Nanotrasen Clown Response Team"