Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions code/datums/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "HONK Squad"
mission = "Bring joy and happiness to all the crew the only way a clown can. Honk!"
polldesc = "a Nanotrasen Clown Response Team"
8 changes: 8 additions & 0 deletions code/game/objects/items/cards_ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
12 changes: 11 additions & 1 deletion code/modules/antagonists/ert/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,16 @@
outfit = /datum/outfit/death_commando
role = "Officer"

/datum/antagonist/ert/clown/robust
name = "Clown Commander"
outfit = /datum/outfit/ert/clown/leader
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
Expand Down Expand Up @@ -152,4 +162,4 @@
missiondesc += " Follow orders given to you by your squad leader."

missiondesc += "<BR><B>Your Mission</B> : [ert_team.mission.explanation_text]"
to_chat(owner,missiondesc)
to_chat(owner,missiondesc)
40 changes: 38 additions & 2 deletions code/modules/clothing/outfits/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -304,3 +304,39 @@
/obj/item/clothing/mask/gas/sechailer=1,\
/obj/item/grenade/clusterbuster/cleaner=3)

/datum/outfit/ert/clown
name = "Honk Squad Clown"
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)
back = /obj/item/storage/backpack/clown
box = /obj/item/storage/box/hug/survival
chameleon_extras = /obj/item/stamp/clown

/datum/outfit/ert/clown/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
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
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
l_hand = /obj/item/pneumatic_cannon/pie/selfcharge