cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 15:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519)

Browse Source
This commit is contained in:
Fluffy
2023-01-10 19:22:14 +01:00
committed by GitHub
parent 933e8521eb
commit 04d89f212a
512 changed files with 7623 additions and 7233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/launcher/crossbow.dm
View File

@@ -11,7 +11,7 @@
sharp = TRUE
edge = FALSE
drop_sound = 'sound/items/drop/sword.ogg'
pickup_sound = /decl/sound_category/sword_pickup_sound
pickup_sound = /singleton/sound_category/sword_pickup_sound
/obj/item/arrow/proc/removed() //Helper for metal rods falling apart.
return
@@ -27,7 +27,7 @@
icon_state = "metal-rod"
item_state = "bolt"
drop_sound = 'sound/items/drop/sword.ogg'
pickup_sound = /decl/sound_category/sword_pickup_sound
pickup_sound = /singleton/sound_category/sword_pickup_sound
/obj/item/arrow/quill
name = "alien quill"

2
code/modules/projectiles/guns/launcher/syringe_gun.dm
View File

@@ -51,7 +51,7 @@
var/mob/living/L = hit_atom
//unfortuately we don't know where the dart will actually hit, since that's done by the parent.
if(L.can_inject() && syringe.reagents)
var/decl/reagent/reagent_log = syringe.reagents.get_reagents()
var/singleton/reagent/reagent_log = syringe.reagents.get_reagents()
syringe.reagents.trans_to_mob(L, 15, CHEM_BLOOD)
admin_inject_log(thrower, L, src, reagent_log, syringe.reagents.get_temperature(), 15, violent=1)