Skip to content

Commit

Permalink
broad cringe removal (shiptest-ss13#3142)
Browse files Browse the repository at this point in the history
## About The Pull Request

- Removes the ability for ghosts to click on mice and take control of
them
- Removes a vast majority of forcesays from the game (gibbering I've
left untouched for now but if theres interest in axing it I will)
- Removes char from the game (only made you spout forcesays)
- Spraytan overdose no longer exists and will no longer turn you into a
surfer
- Removes every gibbering line
- Removes Chav, Swedish, and Elvis mutations
- Misc forcesay removals

## Why It's Good For The Game

No more White Sands jank and no more unfunny forcesay leftovers from tg

## Changelog

:cl:
del: Removed mice possession 
del: Broad removal of forcesays from most reagents and items
del: Removed char reagent and spraytan overdose
del: Removed gibbering lines
del: Removed Chav, Swedish, Elvis mutations
/:cl:
  • Loading branch information
generalthrax authored and FalloutFalcon committed Aug 30, 2024
1 parent 767795e commit 4ad8d9e
Show file tree
Hide file tree
Showing 16 changed files with 5 additions and 531 deletions.
3 changes: 0 additions & 3 deletions code/__DEFINES/DNA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
#define MUT_MUTE /datum/mutation/human/mute
#define STONER /datum/mutation/human/stoner
#define UNINTELLIGIBLE /datum/mutation/human/unintelligible
#define SWEDISH /datum/mutation/human/swedish
#define CHAV /datum/mutation/human/chav
#define ELVIS /datum/mutation/human/elvis
#define RADIOACTIVE /datum/mutation/human/radioactive
#define GLOWY /datum/mutation/human/glow
#define ANTIGLOWY /datum/mutation/human/glow/anti
Expand Down
19 changes: 2 additions & 17 deletions code/__HELPERS/roundend.dm
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,9 @@

//Medals
parts += medal_report()
//WS Begin
CHECK_TICK

//Mouse
parts += mouse_report()

CHECK_TICK
//WS End

//Station Goals
parts += goal_report()

Expand Down Expand Up @@ -459,17 +454,7 @@
parts += com
return "<div class='panel stationborder'>[parts.Join("<br>")]</div>"
return ""
//WS Begin
/datum/controller/subsystem/ticker/proc/mouse_report()
if(GLOB.mouse_food_eaten)
var/list/parts = list()
parts += "<span class='header'>Mouse stats:</span>"
parts += "Mouse Born: [GLOB.mouse_spawned]"
parts += "Mouse Killed: [GLOB.mouse_killed]"
parts += "Trash Eaten: [GLOB.mouse_food_eaten]"
return "<div class='panel stationborder'>[parts.Join("<br>")]</div>"
return ""
//WS End

/datum/controller/subsystem/ticker/proc/antag_report()
var/list/result = list()
var/list/all_teams = list()
Expand Down
2 changes: 0 additions & 2 deletions code/datums/brain_damage/mild.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@
owner.derpspeech = min(owner.derpspeech + 5, 25)
if(prob(3))
owner.emote("drool")
else if(owner.stat == CONSCIOUS && prob(3))
owner.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage"), forced = "brain damage")
..()

/datum/brain_trauma/mild/dumbness/on_lose()
Expand Down
123 changes: 0 additions & 123 deletions code/datums/mutations/speech.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,129 +68,6 @@
return
REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)

/datum/mutation/human/swedish
name = "Swedish"
desc = "A horrible mutation originating from the distant past. Thought to be eradicated after the incident in 2037."
quality = MINOR_NEGATIVE
text_gain_indication = "<span class='notice'>You feel Swedish, however that works.</span>"
text_lose_indication = "<span class='notice'>The feeling of Swedishness passes.</span>"

/datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))

/datum/mutation/human/swedish/on_losing(mob/living/carbon/human/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)

/datum/mutation/human/swedish/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER

var/message = speech_args[SPEECH_MESSAGE]
if(message)
message = replacetext(message,"w","v")
message = replacetext(message,"j","y")
message = replacetext(message,"a",pick("å","ä","æ","a"))
message = replacetext(message,"bo","bjo")
message = replacetext(message,"o",pick("ö","ø","o"))
if(prob(30))
message += " Bork[pick("",", bork",", bork, bork")]!"
speech_args[SPEECH_MESSAGE] = trim(message)

/datum/mutation/human/chav
name = "Chav"
desc = "Unknown"
quality = MINOR_NEGATIVE
text_gain_indication = "<span class='notice'>Ye feel like a reet prat like, innit?</span>"
text_lose_indication = "<span class='notice'>You no longer feel like being rude and sassy.</span>"

/datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))

/datum/mutation/human/chav/on_losing(mob/living/carbon/human/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)

/datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args)
var/message = speech_args[SPEECH_MESSAGE]
if(message)
message = " [message] "
message = replacetext(message," looking at "," gawpin' at ")
message = replacetext(message," great "," bangin' ")
message = replacetext(message," man "," mate ")
message = replacetext(message," friend ",pick(" mate "," bruv "," bledrin "))
message = replacetext(message," what "," wot ")
message = replacetext(message," drink "," wet ")
message = replacetext(message," get "," giz ")
message = replacetext(message," what "," wot ")
message = replacetext(message," no thanks "," wuddent fukken do one ")
message = replacetext(message," i don't know "," wot mate ")
message = replacetext(message," no "," naw ")
message = replacetext(message," robust "," chin ")
message = replacetext(message," hi "," how what how ")
message = replacetext(message," hello "," sup bruv ")
message = replacetext(message," kill "," bang ")
message = replacetext(message," murder "," bang ")
message = replacetext(message," windows "," windies ")
message = replacetext(message," window "," windy ")
message = replacetext(message," break "," do ")
message = replacetext(message," your "," yer ")
message = replacetext(message," security "," coppers ")
speech_args[SPEECH_MESSAGE] = trim(message)


/datum/mutation/human/elvis
name = "Elvis"
desc = "A terrifying mutation named after its 'patient-zero'."
quality = MINOR_NEGATIVE
locked = TRUE
text_gain_indication = "<span class='notice'>You feel pretty good, honeydoll.</span>"
text_lose_indication = "<span class='notice'>You feel a little less conversation would be great.</span>"

/datum/mutation/human/elvis/on_life()
switch(pick(1,2))
if(1)
if(prob(15))
var/list/dancetypes = list("swinging", "fancy", "stylish", "20'th century", "jivin'", "rock and roller", "cool", "salacious", "bashing", "smashing")
var/dancemoves = pick(dancetypes)
owner.visible_message("<b>[owner]</b> busts out some [dancemoves] moves!")
if(2)
if(prob(15))
owner.visible_message("<b>[owner]</b> [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!")

/datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))

/datum/mutation/human/elvis/on_losing(mob/living/carbon/human/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)

/datum/mutation/human/elvis/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER

var/message = speech_args[SPEECH_MESSAGE]
if(message)
message = " [message] "
message = replacetext(message," i'm not "," I aint ")
message = replacetext(message," girl ",pick(" honey "," baby "," baby doll "))
message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo "))
message = replacetext(message," out of "," outta ")
message = replacetext(message," thank you "," thank you, thank you very much ")
message = replacetext(message," thanks "," thank you, thank you very much ")
message = replacetext(message," what are you "," whatcha ")
message = replacetext(message," yes ",pick(" sure", "yea "))
message = replacetext(message," muh valids "," my kicks ")
speech_args[SPEECH_MESSAGE] = trim(message)


/datum/mutation/human/stoner
name = "Stoner"
desc = "A common mutation that severely decreases intelligence."
Expand Down
24 changes: 0 additions & 24 deletions code/game/objects/items/dna_injector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -247,30 +247,6 @@
name = "\improper DNA injector (Anti-Unintelligible)"
remove_mutations = list(UNINTELLIGIBLE)

/obj/item/dnainjector/swedishmut
name = "\improper DNA injector (Swedish)"
add_mutations = list(SWEDISH)

/obj/item/dnainjector/antiswedish
name = "\improper DNA injector (Anti-Swedish)"
remove_mutations = list(SWEDISH)

/obj/item/dnainjector/chavmut
name = "\improper DNA injector (Chav)"
add_mutations = list(CHAV)

/obj/item/dnainjector/antichav
name = "\improper DNA injector (Anti-Chav)"
remove_mutations = list(CHAV)

/obj/item/dnainjector/elvismut
name = "\improper DNA injector (Elvis)"
add_mutations = list(ELVIS)

/obj/item/dnainjector/antielvis
name = "\improper DNA injector (Anti-Elvis)"
remove_mutations = list(ELVIS)

/obj/item/dnainjector/lasereyesmut
name = "\improper DNA injector (Laser Eyes)"
add_mutations = list(LASEREYES)
Expand Down
7 changes: 0 additions & 7 deletions code/modules/clothing/masks/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,6 @@
clothing_flags = VOICEBOX_TOGGLABLE
modifies_speech = TRUE

/obj/item/clothing/mask/frog/handle_speech(datum/source, list/speech_args) //whenever you speak
if(!(clothing_flags & VOICEBOX_DISABLED))
if(prob(5)) //sometimes, the angry spirit finds others words to speak.
speech_args[SPEECH_MESSAGE] = pick("HUUUUU!!","SMOOOOOKIN'!!","Hello my baby, hello my honey, hello my rag-time gal.", "Feels bad, man.", "GIT DIS GUY OFF ME!!" ,"SOMEBODY STOP ME!!", "NORMIES, GET OUT!!")
else
speech_args[SPEECH_MESSAGE] = pick("Ree!!", "Reee!!","REEE!!","REEEEE!!") //but its usually just angry gibberish,

/obj/item/clothing/mask/frog/cursed
clothing_flags = NONE

Expand Down
1 change: 0 additions & 1 deletion code/modules/food_and_drinks/kitchen_machinery/grill.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
smoke.start()
if(grilled_item)
grill_time += 1
grilled_item.reagents.add_reagent(/datum/reagent/consumable/char, 1)
grill_fuel -= 10
grilled_item.AddComponent(/datum/component/sizzle)

Expand Down
70 changes: 1 addition & 69 deletions code/modules/mob/dead/observer/observer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
add_verb(src, list(
/mob/dead/observer/proc/dead_tele,
/mob/dead/observer/proc/open_spawners_menu,
/mob/dead/observer/proc/tray_view,
/mob/dead/observer/proc/possess_mouse_verb))
/mob/dead/observer/proc/tray_view))

if(icon_state in GLOB.ghost_forms_with_directions_list)
ghostimage_default = image(src.icon,src,src.icon_state + "_nodir")
Expand Down Expand Up @@ -961,70 +960,3 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
client.images += t_ray_images
else
client.images -= stored_t_ray_images

//WS Begin
/mob/dead/observer/proc/possess_mouse_verb()
set category = "Ghost"
set name = "Possess a mouse"
set desc = "Possess a mouse to haunt the station.... and their food!"

var/list/possessible = list()

for(var/mob/living/simple_animal/mouse/M in GLOB.alive_mob_list)
if(M.stat != CONSCIOUS)
continue
if(M.key)
continue
if(M in GLOB.player_list)
continue
if(M.mind)
continue

possessible += M

if(!possessible.len)
to_chat(src, "<span class='warning'>There are currently no mice able to be possessed!</span>")
return FALSE

var/mob/living/simple_animal/mouse/M = pick(possessible)

possess_mouse(M)


/mob/dead/observer/proc/possess_mouse(mob/living/simple_animal/mouse/M)
if(!M)
return FALSE

if(!SSticker.HasRoundStarted())
to_chat(usr, "<span class='warning'>The round hasn't started yet!</span>")
return FALSE

if(is_banned_from(key, ROLE_SENTIENCE))
to_chat(src, "<span class='warning'>You are job banned!</span>")
return FALSE

if(alert("Are you sure you want to become a mouse? (Warning, you can no longer be cloned!)",,"Yes","No") != "Yes")
return FALSE

if(M.key || (M.stat != CONSCIOUS) || (M in GLOB.player_list) || M.mind || QDELETED(src) || QDELETED(M))
to_chat(src, "<span class='warning'>This mouse is unable to be controlled, please try again!")
return FALSE

log_game("[key_name(src)] has became a mouse")

M.key = key
M.faction = list("neutral")
M.chew_probability = 0 //so they cant pull off a big brain play by ghosting somewhere or idk
M.layer = BELOW_OPEN_DOOR_LAYER //ENGAGE ADVANCED HIDING BRAIN FUNCTIONS
M.language_holder = new /datum/language_holder/mouse(M)
M.pass_flags |= PASSDOORHATCH
M.sentience_act()
M.maxHealth = 15
M.health = M.maxHealth

to_chat(M , "<span class='warning'>You are now possessing a mouse. \
You do not remember your previous life. You can eat trash and \
food on the floor to gain health and help create new mice. Mouse traps will hurt your fragile body \
and so will any kind of weapons. You can control click food and trash items in order to eat them. Get. That. Cheese.")
return TRUE
//WS End
3 changes: 0 additions & 3 deletions code/modules/mob/living/simple_animal/friendly/mouse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,6 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
else
return ..()

/mob/living/simple_animal/mouse/attack_ghost(mob/dead/observer/user)
user.possess_mouse(src)

/mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force, supress_message)
return FALSE

Expand Down
16 changes: 0 additions & 16 deletions code/modules/reagents/chemistry/reagents/food_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -770,22 +770,6 @@
taste_description = "caramel"
reagent_state = SOLID

/datum/reagent/consumable/char
name = "Char"
description = "Essence of the grill. Has strange properties when overdosed."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#C8C8C8"
taste_mult = 6
taste_description = "smoke"
overdose_threshold = 15

/datum/reagent/consumable/char/overdose_process(mob/living/M)
if(prob(25))
M.say(pick_list_replacements(BOOMER_FILE, "boomer"), forced = /datum/reagent/consumable/char)
..()
return

/datum/reagent/consumable/bbqsauce
name = "BBQ Sauce"
description = "Sweet, smoky, savory, and gets everywhere. Perfect for grilling."
Expand Down
3 changes: 0 additions & 3 deletions code/modules/reagents/chemistry/reagents/medicine_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1310,8 +1310,6 @@
M.adjustStaminaLoss(-3 * REM, 0)
M.jitteriness = min(max(0, M.jitteriness + 3), 30)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * REM, 150)
if(prob(10))
M.say(pick("Yeah, well, you know, that's just, like, uh, your opinion, man.", "Am I glad he's frozen in there and that we're out here, and that he's the sheriff and that we're frozen out here, and that we're in there, and I just remembered, we're out here. What I wanna know is: Where's the caveman?", "It ain't me, it ain't me...", "Make love, not war!", "Stop, hey, what's that sound? Everybody look what's going down...", "Do you believe in magic in a young girl's heart?"), forced = /datum/reagent/medicine/earthsblood)
M.druggy = min(max(0, M.druggy + 10), 15) //See above
..()
. = 1
Expand Down Expand Up @@ -2073,7 +2071,6 @@
bp.receive_damage(0, 0, 200)
else //SUCH A LUST FOR REVENGE!!!
to_chat(M, "<span class='warning'>A phantom limb hurts!</span>")
M.say("Why are we still here, just to suffer?", forced = /datum/reagent/medicine/lavaland_extract)
return ..()

/datum/reagent/medicine/skeletons_boon
Expand Down
Loading

0 comments on commit 4ad8d9e

Please sign in to comment.