Deletes the clown outfit from the game. (#11722)

This commit is contained in:
Matt Atlas
2021-04-24 18:24:33 +02:00
committed by GitHub
parent 3154129191
commit 68dff443d6
36 changed files with 46 additions and 169 deletions
-1
View File
@@ -156,7 +156,6 @@
/obj/item/clothing/shoes = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/shoes/chameleon = TRADER_BLACKLIST,
/obj/item/clothing/shoes/combat = TRADER_BLACKLIST,
/obj/item/clothing/shoes/clown_shoes = TRADER_BLACKLIST,
/obj/item/clothing/shoes/cult = TRADER_BLACKLIST,
/obj/item/clothing/shoes/cyborg = TRADER_BLACKLIST,
/obj/item/clothing/shoes/lightrig = TRADER_BLACKLIST_ALL,
-5
View File
@@ -85,13 +85,8 @@
)
possible_trading_items = list(
/obj/item/clothing/mask/gas/clown_hat = TRADER_THIS_TYPE,
/obj/item/clothing/mask/gas/sexyclown = TRADER_THIS_TYPE,
/obj/item/clothing/shoes/clown_shoes = TRADER_THIS_TYPE,
/obj/item/clothing/under/rank/clown = TRADER_THIS_TYPE,
/obj/item/modular_computer/handheld/pda/civilian/clown = TRADER_THIS_TYPE,
/obj/item/stamp/clown = TRADER_THIS_TYPE,
/obj/item/storage/backpack/clown = TRADER_THIS_TYPE,
/obj/item/bananapeel = TRADER_THIS_TYPE,
/obj/item/reagent_containers/food/snacks/pie = TRADER_THIS_TYPE,
/obj/item/bikehorn = TRADER_THIS_TYPE,
-5
View File
@@ -241,11 +241,6 @@
new /obj/item/staff/(src.loc)
delete_me = 1
/obj/effect/landmark/costume/sexyclown/New()
new /obj/item/clothing/mask/gas/sexyclown(src.loc)
new /obj/item/clothing/under/sexyclown(src.loc)
delete_me = 1
/obj/effect/landmark/costume/sexymime/New()
new /obj/item/clothing/mask/gas/sexymime(src.loc)
new /obj/item/clothing/under/sexymime(src.loc)
@@ -200,7 +200,6 @@
/obj/item/storage/box/fancy/cigarettes/dromedaryco,
/obj/item/toy/bosunwhistle,
/obj/item/clothing/mask/fakemoustache,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/mask/gas/mime,
/obj/item/clothing/head/festive/santa,
/obj/item/stack/material/animalhide/lizard,
@@ -268,7 +267,6 @@
/obj/item/device/flashlight/lantern,
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/accessory/badge/old,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/mask/gas/mime,
/obj/item/clothing/shoes/galoshes,
/mob/living/simple_animal/lizard,
@@ -311,7 +309,6 @@
/obj/item/inflatable_duck,
/obj/item/beach_ball,
/obj/item/clothing/under/syndicate/tracksuit,
/obj/item/clothing/under/rank/clown,
/obj/item/clothing/under/mime,
/obj/item/clothing/under/rank/fatigues/marine,
/obj/item/clothing/under/rank/dress/marine,
@@ -113,12 +113,6 @@
name = "adorned backpack"
desc = "A backpack adorned with various decorations."
/obj/item/storage/backpack/clown
name = "Giggles von Honkerton"
desc = "It's a backpack made by Honk! Co."
icon_state = "clownpack"
item_state_slots = null
/obj/item/storage/backpack/medic
name = "medical backpack"
desc = "It's a backpack especially designed for use in a sterile environment."
-5
View File
@@ -422,7 +422,6 @@
/obj/item/storage/backpack = 3,
/obj/item/storage/backpack/holding = 0.5,
/obj/item/storage/backpack/cultpack = 2,
/obj/item/storage/backpack/clown = 2,
/obj/item/storage/backpack/medic = 3,
/obj/item/storage/backpack/security = 3,
/obj/item/storage/backpack/captain = 2,
@@ -805,7 +804,6 @@
/obj/item/clothing/mask/balaclava = 0.75,
/obj/item/clothing/mask/fakemoustache = 0.4,
/obj/item/clothing/mask/gas = 1.25,
/obj/item/clothing/mask/gas/clown_hat = 0.1,
/obj/item/clothing/mask/gas/cyborg = 0.7,
/obj/item/clothing/mask/gas/mime = 0.1,
/obj/item/clothing/mask/gas/old = 0.75,
@@ -820,7 +818,6 @@
/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba = 0.7,
/obj/item/clothing/mask/smokable/pipe/cobpipe = 0.5,
/obj/item/clothing/shoes/carp = 0.5,
/obj/item/clothing/shoes/clown_shoes = 0.1,
/obj/item/clothing/shoes/combat = 0.2,
/obj/item/clothing/shoes/cyborg = 0.4,
/obj/item/clothing/shoes/galoshes = 0.6,
@@ -838,7 +835,6 @@
/obj/item/clothing/under/mime = 0.1,
/obj/item/clothing/under/overalls = 1,
/obj/item/clothing/under/rainbow = 0.9,
/obj/item/clothing/under/rank/clown = 0.1,
/obj/item/clothing/under/syndicate/tacticool = 0.4,
/obj/item/clothing/under/syndicate/tracksuit = 0.2,
/obj/item/device/firing_pin = 0.3,
@@ -1254,7 +1250,6 @@
/obj/item/grenade/fake = 1,
/obj/item/bikehorn = 11,
/obj/item/clothing/mask/fakemoustache = 11,
/obj/item/clothing/mask/gas/clown_hat = 11,
/obj/item/clothing/mask/gas/mime = 11,
/obj/item/clothing/shoes/carp = 9,
/obj/item/gun/energy/wand/toy = 5,
-6
View File
@@ -407,12 +407,6 @@
'sound/weapons/punchmiss2.ogg'
)
/decl/sound_category/clown_sound
sounds = list(
'sound/effects/clownstep1.ogg',
'sound/effects/clownstep2.ogg'
)
/decl/sound_category/swing_hit_sound
sounds = list(
'sound/weapons/genhit1.ogg',
+1 -2
View File
@@ -134,8 +134,7 @@ var/static/list/scarySounds = list(
'sound/items/welder.ogg',
'sound/items/welder_pry.ogg',
'sound/machines/airlock.ogg',
'sound/effects/clownstep1.ogg',
'sound/effects/clownstep2.ogg'
)
// Bomb cap!
-12
View File
@@ -172,18 +172,6 @@
species = SPECIES_SKELETON
corpseid = 0
/obj/effect/landmark/corpse/clown
name = "Clown"
corpseuniform = /obj/item/clothing/under/rank/clown
corpseshoes = /obj/item/clothing/shoes/clown_shoes
corpseradio = /obj/item/device/radio/headset
corpsemask = /obj/item/clothing/mask/gas/clown_hat
corpsepocket1 = /obj/item/bikehorn
corpseback = /obj/item/storage/backpack/clown
corpseid = 1
corpseidjob = "Clown"
corpseidaccess = "Clown"
/obj/effect/landmark/corpse/scientist
name = "Scientist"
corpseradio = /obj/item/device/radio/headset/headset_sci
@@ -491,8 +491,6 @@ STOCK_ITEM_COMMON(gasmask, 2)
/obj/item/clothing/mask/gas = 10,
/obj/item/clothing/mask/gas/plaguedoctor = 1,
/obj/item/clothing/mask/gas/swat = 5,
/obj/item/clothing/mask/gas/clown_hat = 0.5,
/obj/item/clothing/mask/gas/sexyclown = 0.5,
/obj/item/clothing/mask/gas/mime = 0.5,
/obj/item/clothing/mask/gas/monkeymask = 0.5,
/obj/item/clothing/mask/gas/sexymime = 0.5,
-12
View File
@@ -78,18 +78,6 @@
item_state = "swat"
siemens_coefficient = 0.7
/obj/item/clothing/mask/gas/clown_hat
name = "clown wig and mask"
desc = "A true prankster's facial attire. A clown is incomplete without their wig and mask."
icon_state = "clown"
item_state = "clown"
/obj/item/clothing/mask/gas/sexyclown
name = "sexy-clown wig and mask"
desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
icon_state = "sexyclown"
item_state = "sexyclown"
/obj/item/clothing/mask/gas/mime
name = "mime mask"
desc = "The traditional mime's mask. It has an eerie facial posture."
@@ -92,24 +92,6 @@ obj/item/clothing/shoes/sandal/clogs
item_state = "clogs"
sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/shoes.dmi')
/obj/item/clothing/shoes/clown_shoes
desc = "The prankster's standard-issue clowning shoes. Damn they're huge!"
name = "clown shoes"
icon_state = "clown"
item_state = "clown_shoes"
slowdown = 1
species_restricted = null
/obj/item/clothing/shoes/clown_shoes/handle_movement(var/turf/walking, var/running)
if(!running)
if(footstep >= 2)
footstep = 0
playsound(src, /decl/sound_category/clown_sound, 20, 1)
else
footstep++
else
playsound(src, /decl/sound_category/clown_sound, 50, 1) // Running is louder.
/obj/item/clothing/shoes/cyborg
name = "cyborg boots"
desc = "Shoes for a cyborg costume"
@@ -41,13 +41,6 @@
item_state = "w_suit"
worn_state = "chef"
/obj/item/clothing/under/rank/clown
name = "clown suit"
desc = "<i>'HONK!'</i>"
icon_state = "clown"
item_state = "clown"
worn_state = "clown"
/obj/item/clothing/under/rank/head_of_personnel
desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
name = "head of personnel's jumpsuit"
@@ -45,14 +45,6 @@
item_state = "waiter"
worn_state = "waiter"
/obj/item/clothing/under/sexyclown
name = "sexy-clown suit"
desc = "It makes you look HONKable!"
icon_state = "sexyclown"
item_state = "clown"
worn_state = "sexyclown"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
//This set of uniforms looks fairly fancy and is generally used for high-ranking NT personnel from what I've seen, so lets give them appropriate ranks.
/obj/item/clothing/under/rank/centcom
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain.\""
@@ -74,10 +74,6 @@
// I'm not sorry.
/obj/effect/map_effect/interval/sound_emitter/clownsteps
sounds_to_play = list(/decl/sound_category/clown_sound)
interval_lower_bound = 5
interval_upper_bound = 1 SECOND
/obj/effect/map_effect/interval/sound_emitter/bikehorns
sounds_to_play = list('sound/items/bikehorn.ogg')
-1
View File
@@ -466,7 +466,6 @@ var/list/worths = list(
//SHOES,
/obj/item/clothing/shoes/galoshes = 50,
/obj/item/clothing/shoes/syndigaloshes = 250,
/obj/item/clothing/shoes/clown_shoes = 100,
/obj/item/clothing/shoes/cult = 350,
/obj/item/clothing/shoes/magboots = 350,
/obj/item/clothing/shoes/swat = 200,
+4 -9
View File
@@ -118,15 +118,10 @@
new /obj/item/material/sword/katana(src)
if(93)
new /obj/item/dnainjector/xraymut(src) // Probably the least OP
if(94) // Why the hell not
new /obj/item/storage/backpack/clown(src)
new /obj/item/clothing/under/rank/clown(src)
new /obj/item/clothing/shoes/clown_shoes(src)
new /obj/item/modular_computer/handheld/pda/civilian/clown(src)
new /obj/item/clothing/mask/gas/clown_hat(src)
new /obj/item/bikehorn(src)
new /obj/item/pen/crayon/rainbow(src)
new /obj/item/reagent_containers/spray/waterflower(src)
if(94)
new /obj/item/clothing/suit/space/void/zavodskoi(src)
new /obj/item/clothing/head/helmet/space/void/zavodskoi(src)
new /obj/item/flag/zavodskoi/l(src)
if(95)
new /obj/item/clothing/under/mime(src)
new /obj/item/clothing/shoes/black(src)
@@ -116,37 +116,17 @@
corpseidjob = "Operative"
corpseidaccess = "Syndicate"
/obj/effect/landmark/mobcorpse/clown
name = "Clown"
corpseuniform = /obj/item/clothing/under/rank/clown
corpseshoes = /obj/item/clothing/shoes/clown_shoes
corpseradio = /obj/item/device/radio/headset
corpsemask = /obj/item/clothing/mask/gas/clown_hat
corpsepocket1 = /obj/item/bikehorn
corpseback = /obj/item/storage/backpack/clown
corpseid = 1
corpseidjob = "Clown"
corpseidaccess = "Clown"
/obj/effect/landmark/mobcorpse/pirate
name = "Pirate"
corpseshoes = /obj/item/clothing/shoes/jackboots
corpseglasses = /obj/item/clothing/glasses/eyepatch
corpsehelmet = /obj/item/clothing/head/bandana/pirate
/obj/effect/landmark/mobcorpse/pirate/ranged
name = "Pirate Gunner"
corpsesuit = /obj/item/clothing/suit/pirate
corpsehelmet = /obj/item/clothing/head/pirate
/obj/effect/landmark/mobcorpse/russian
name = "Russian"
corpseshoes = /obj/item/clothing/shoes/jackboots
-2
View File
@@ -7,8 +7,6 @@ var/list/commando_names = file2list("config/names/death_commando.txt")
var/list/first_names_male = file2list("config/names/first_male.txt")
var/list/first_names_female = file2list("config/names/first_female.txt")
var/list/last_names = file2list("config/names/last.txt")
var/list/clown_names = file2list("config/names/clown.txt")
var/list/verbs = file2list("config/names/verbs.txt")
var/list/adjectives = file2list("config/names/adjectives.txt")
-37
View File
@@ -1,37 +0,0 @@
Gigglesworth
Honkel the III
Goose McSunny
Mr. Shoe
Toodles Sharperton
Dinky Doodle
Honkerbelle
Bo Bo Sassy
Baby Cakes
Ladybug Honks
Ziggy Yoyo
Razzle Dazzle
Buster Frown
Pepinpop
Silly Willy
Jo Jo Bobo Bo
Pocket
Patches
Checkers
Freckle
Honker
Bonker
Skiddle
Scootaloo
Sprinkledinkle
Ronnie Pace
Miss Stockings
Slippy Joe
Redshirt McBeat
Flop O'Honker
Speckles
Bubble
Button
Sparkle
Giggles
Jingle
Candy
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: MattAtlas
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscdel: "The clown outfit has been removed from the game."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 274 KiB

After

Width:  |  Height:  |  Size: 270 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 79 KiB

-4
View File
@@ -63599,10 +63599,6 @@
/turf/simulated/floor/tiled,
/area/rnd/lab)
"liM" = (
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/under/rank/clown,
/obj/item/storage/backpack/clown,
/obj/item/toy/figure/clown,
/obj/structure/closet{
icon_closed = "cabinet_closed";
Binary file not shown.
Binary file not shown.