cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-22 04:26:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into rain

Browse Source
This commit is contained in:
Archie
2021-06-02 04:20:31 -03:00
parent 966da5dbbf 102675a6fb
commit dc9e374d24
49 changed files with 27989 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyperstation/code/game/objects/structures/ghost_role_spawners.dm
+6
View File
@@ -47,6 +47,9 @@
new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src))
return ..()
/obj/effect/mob_spawn/human/duohermit/special(mob/living/carbon/human/new_spawn)
ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
//Exiles: Stranded exiles that have been left in Snowdin. Can be easily adapted for other roles as well.
/obj/effect/mob_spawn/human/exiled
name = "used bed"
@@ -105,3 +108,6 @@
/obj/effect/mob_spawn/human/exiled/Destroy()
new/obj/structure/bed(get_turf(src))
return ..()
/obj/effect/mob_spawn/human/exiled/special(mob/living/carbon/human/new_spawn)
ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
hyperstation/code/modules/mob/mob_helpers.dm
+1
View File
@@ -18,6 +18,7 @@ mob/proc/checkloadappearance()
idCard.update_label(H.real_name, idCard.assignment)
idCard.registered_name = H.real_name
H.mirrorcanloadappearance = FALSE //Prevents them from using the mirror again.
ADD_TRAIT(H,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT) //Makes sure they are exempt from health events.
SEND_SOUND(H, 'sound/magic/charge.ogg') //Fluff
to_chat(H, "<span class='boldannounce'>Your head aches for a second. You feel like this is how things should have been.</span>")
log_game("[key_name(H)] has loaded their default appearance for a ghost role.")
hyperstation/code/modules/power/reactor/rbmk.dm
+4 -1
View File
@@ -882,7 +882,11 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
/obj/effect/decal/nuclear_waste/Initialize()
. = ..()
for(var/obj/A in get_turf(src))
if(istype(A, /obj/structure))
qdel(src) //It is more processing efficient to do this here rather than when searching for available turfs.
set_light(3)
AddComponent(/datum/component/radioactive, 1000, src, 0)
/obj/effect/decal/nuclear_waste/epicenter //The one that actually does the irradiating. This is to avoid every bit of sludge PROCESSING
name = "Dense nuclear sludge"
@@ -904,7 +908,6 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
/obj/effect/decal/nuclear_waste/epicenter/Initialize()
. = ..()
AddComponent(/datum/component/radioactive, 1500, src, 0)
/obj/effect/decal/nuclear_waste/Crossed(atom/movable/AM)
. = ..()