mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2026-08-30 08:07:03 +01:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -399,8 +399,8 @@
|
||||
var/emp_cur_charges = 4
|
||||
var/charge_tick = 0
|
||||
|
||||
/obj/item/flashlight/emp/New()
|
||||
..()
|
||||
/obj/item/flashlight/emp/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/flashlight/emp/Destroy()
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
var/forgedseal = 0
|
||||
var/copy_type = null
|
||||
|
||||
/obj/item/documents/photocopy/New(loc, obj/item/documents/copy=null)
|
||||
..()
|
||||
/obj/item/documents/photocopy/Initialize(mapload, obj/item/documents/copy=null)
|
||||
. = ..()
|
||||
if(copy)
|
||||
copy_type = copy.type
|
||||
if(istype(copy, /obj/item/documents/photocopy)) // Copy Of A Copy Of A Copy
|
||||
|
||||
@@ -513,7 +513,6 @@
|
||||
S.ckey = C.ckey
|
||||
S.status_flags |= GODMODE
|
||||
S.copy_languages(user, LANGUAGE_MASTER) //Make sure the sword can understand and communicate with the user.
|
||||
S.update_atom_languages()
|
||||
grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue
|
||||
S.AddElement(/datum/element/ghost_role_eligibility,penalize_on_ghost = TRUE)
|
||||
START_PROCESSING(SSprocessing,src)
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
if(H.internal == src)
|
||||
to_chat(H, "<span class='notice'>You close [src] valve.</span>")
|
||||
H.internal = null
|
||||
H.update_internals_hud_icon(0)
|
||||
else
|
||||
if(!H.getorganslot(ORGAN_SLOT_BREATHING_TUBE))
|
||||
if(HAS_TRAIT(H, TRAIT_NO_INTERNALS))
|
||||
@@ -60,7 +59,6 @@
|
||||
else
|
||||
to_chat(H, "<span class='notice'>You open [src] valve.</span>")
|
||||
H.internal = src
|
||||
H.update_internals_hud_icon(1)
|
||||
H.update_action_buttons_icon()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user