cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-10 15:36:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

One big commit squished together

Browse Source 
you scope increase !

out of the ordinary, I mean

Bad code unbadded

you scope increase !
This commit is contained in:
ReoDaProtovali
2024-05-09 04:46:22 -05:00
parent e08d5bf94c
commit 4e03da3eab
57 changed files with 473 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/mob/cit_emotes.dm
+3 -1
View File
@@ -44,6 +44,7 @@
sound = 'modular_citadel/sound/voice/scream_monkey.ogg'
if(istype(user, /mob/living/simple_animal/hostile/gorilla))
sound = 'sound/creatures/gorilla.ogg'
/* //Gainstation Remove: Human species scream overhaul oops
if(ishuman(user))
user.adjustOxyLoss(5)
sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg')
@@ -57,6 +58,7 @@
sound = 'modular_citadel/sound/voice/scream_skeleton.ogg'
if (is_species(user, /datum/species/fly) || is_species(user, /datum/species/insect))
sound = 'modular_citadel/sound/voice/scream_moth.ogg'
*/
if(isalien(user))
sound = 'sound/voice/hiss6.ogg'
LAZYINITLIST(user.alternate_screams)
@@ -70,7 +72,7 @@
message = "makes a very loud noise."
. = ..()
/datum/emote/sound/carbon/snap
/datum/emote/carbon/snap
key = "snap"
key_third_person = "snaps"
muzzle_ignore = TRUE
modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+12
View File
@@ -13,6 +13,18 @@
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
liked_food = MEAT | FRIED
disliked_food = TOXIC
//Same as humans
var/list/female_screams = list('sound/voice/human/femalescream_1.ogg', 'sound/voice/human/femalescream_2.ogg', 'sound/voice/human/femalescream_3.ogg', 'sound/voice/human/femalescream_4.ogg', 'sound/voice/human/femalescream_5.ogg')
var/list/male_screams = list('sound/voice/human/malescream_1.ogg', 'sound/voice/human/malescream_2.ogg', 'sound/voice/human/malescream_3.ogg', 'sound/voice/human/malescream_4.ogg', 'sound/voice/human/malescream_5.ogg')
/datum/species/human/get_scream_sound(mob/living/carbon/human/H)
if(H.gender == FEMALE)
return pick(female_screams)
else
if(prob(1))
return sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg', \
'sound/voice/human/wilhelm_scream.ogg')
return pick(male_screams)
//Curiosity killed the cat's wagging tail.
/datum/species/mammal/spec_death(gibbed, mob/living/carbon/human/H)
modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm
+2
View File
@@ -19,6 +19,8 @@
mutantstomach = /obj/item/organ/stomach/ipc
mutanteyes = /obj/item/organ/eyes/ipc
screamsound = list('goon/sound/robot_scream.ogg', 'modular_citadel/sound/voice/scream_silicon.ogg')
exotic_bloodtype = "HF"
var/datum/action/innate/monitor_change/screen