cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Singletons + refactor of /datum/observ (#15487)

Browse Source
This commit is contained in:
Fluffy
2023-01-05 18:41:40 +01:00
committed by GitHub
parent 95f8207f08
commit 0ddcf0817a
507 changed files with 7603 additions and 7214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/projectile/bullets.dm
View File

@@ -289,14 +289,14 @@
if(blocked < 100 && !(blocked < 20))
L.emote("yawns")
if(blocked < 20)
if(L.reagents) L.reagents.add_reagent(/decl/reagent/soporific, 10)
if(L.reagents) L.reagents.add_reagent(/singleton/reagent/soporific, 10)
if(def_zone == BP_HEAD && blocked < 100)
if(L.reagents) L.reagents.add_reagent(/decl/reagent/soporific, 15)
if(L.reagents) L.reagents.add_reagent(/singleton/reagent/soporific, 15)
if(def_zone != "torso" && def_zone != BP_HEAD)
if(blocked < 100 && !(blocked < 20))
L.emote("yawns")
if(blocked < 20)
if(L.reagents) L.reagents.add_reagent(/decl/reagent/soporific, 5)
if(L.reagents) L.reagents.add_reagent(/singleton/reagent/soporific, 5)
if(isanimal(target))
target.visible_message("<b>[target]</b> twitches, foaming at the mouth.")

4
code/modules/projectiles/projectile/special.dm
View File

@@ -146,7 +146,7 @@
damage = 0
damage_type = TOX
nodamage = TRUE
var/decl/plantgene/gene = null
var/singleton/plantgene/gene = null
/obj/item/projectile/energy/floramut/on_hit(var/atom/target, var/blocked = 0)
var/mob/living/M = target
@@ -265,7 +265,7 @@
/obj/item/projectile/magic/teleport/on_hit(var/atom/hit_atom)
var/turf/T = get_turf(hit_atom)
single_spark(T)
playsound(src.loc, /decl/sound_category/spark_sound, 50, 1)
playsound(src.loc, /singleton/sound_category/spark_sound, 50, 1)
if(isliving(hit_atom))
blink_mob(hit_atom)
return ..()