Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes some mapped clown gear #4388

Merged
merged 3 commits into from
Sep 12, 2023
Merged

Removes some mapped clown gear #4388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1055d9
Initial
morrowwolf Sep 11, 2023
b895e2f
OK I suppose I will compile this time
morrowwolf Sep 11, 2023
e1c1464
And these, goddamn clowns everywhere man
morrowwolf Sep 11, 2023
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
4 changes: 0 additions & 4 deletions code/game/objects/effects/landmarks/corpsespawner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@
name = "Engineer"
equip_path = /datum/equipment_preset/corpse/engineer

/obj/effect/landmark/corpsespawner/clown
name = "Clown"
equip_path = /datum/equipment_preset/corpse/clown

/obj/effect/landmark/corpsespawner/scientist
name = "Scientist"
equip_path = /datum/equipment_preset/corpse/scientist
Expand Down
27 changes: 0 additions & 27 deletions code/modules/gear_presets/corpses.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,33 +213,6 @@

//*****************************************************************************************************/

/datum/equipment_preset/corpse/clown
name = "Corpse - Clown"
assignment = "Clown"
uses_special_name = TRUE

/datum/equipment_preset/corpse/clown/New()
. = ..()
//As a joke, clown has all access so they can clown everywhere...
access = get_access(ACCESS_LIST_DELIVERY)

/datum/equipment_preset/corpse/clown/load_name(mob/living/carbon/human/new_human, randomise)
. = ..() //To load gender, randomise appearance, etc.
new_human.change_real_name(new_human, pick(clown_names)) //Picking a proper clown name!

/datum/equipment_preset/corpse/clown/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(new_human), WEAR_FACE)
new_human.equip_to_slot_or_del(new /obj/item/toy/bikehorn(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/clown(new_human), WEAR_BACK)
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
add_ice_colony_survivor_equipment(new_human)
else
new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK)

//*****************************************************************************************************/

/datum/equipment_preset/corpse/scientist
name = "Corpse - Scientist"
assignment = "Scientist"
Expand Down
4 changes: 0 additions & 4 deletions maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12808,9 +12808,7 @@
/area/fiorina/lz/near_lzII)
"hTr" = (
/obj/structure/closet,
/obj/item/clothing/mask/gas/clown_hat,
/obj/effect/spawner/random/gun/shotgun/midchance,
/obj/item/clothing/under/marine/ucf_clown,
/turf/open/floor/plating/prison,
/area/fiorina/maintenance)
"hTs" = (
Expand Down Expand Up @@ -25559,8 +25557,6 @@
/area/fiorina/tumor/aux_engi)
"pON" = (
/obj/structure/closet,
/obj/item/storage/backpack/clown,
/obj/item/toy/bikehorn,
/turf/open/floor/prison{
dir = 4;
icon_state = "bluecorner"
Expand Down
9 changes: 1 addition & 8 deletions maps/map_files/Kutjevo/Kutjevo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16657,13 +16657,6 @@
/obj/structure/blocker/invisible_wall,
/turf/open/floor/kutjevo/colors/red/tile,
/area/kutjevo/interior/oob/dev_room)
"wSN" = (
/obj/structure/blocker/invisible_wall,
/obj/effect/landmark/corpsespawner/clown,
/turf/open/desert/desert_shore/desert_shore1{
dir = 1
},
/area/kutjevo/interior/oob/dev_room)
"wSU" = (
/obj/structure/machinery/light{
dir = 4
Expand Down Expand Up @@ -20023,7 +20016,7 @@ rkt
jBJ
fOU
ibm
wSN
rYs
fAF
fQB
uam
Expand Down
1 change: 0 additions & 1 deletion maps/map_files/New_Varadero/New_Varadero.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29173,7 +29173,6 @@
/area/varadero/interior/cargo)
"sCK" = (
/obj/structure/closet/secure_closet/scientist,
/obj/item/clothing/mask/gas/clown_hat,
/turf/open/floor/shiva{
dir = 8;
icon_state = "purple"
Expand Down
9 changes: 1 addition & 8 deletions maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,13 +402,6 @@
/obj/effect/blocker/sorokyne_cold_water,
/turf/open/gm/river,
/area/strata/ag/exterior/paths/cabin_area)
"abx" = (
/obj/effect/landmark/corpsespawner/clown,
/turf/open/floor/strata{
dir = 10;
icon_state = "multi_tiles"
},
/area/strata/ag/interior/outpost/gen/bball/nest)
"aby" = (
/obj/structure/machinery/camera/autoname{
dir = 8
Expand Down Expand Up @@ -61048,7 +61041,7 @@ aac
aac
rKG
bsS
abx
cjq
bvt
rKG
aac
Expand Down