mirror of
https://github.com/Sandstorm-Station/Sandstorm-Station-13.git
synced 2026-08-24 05:39:04 +01:00
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
This commit is contained in:
@@ -39,7 +39,7 @@
|
||||
|
||||
/obj/item/chrono_eraser/item_action_slot_check(slot, mob/user, datum/action/A)
|
||||
if(slot == ITEM_SLOT_BACK)
|
||||
return 1
|
||||
return TRUE
|
||||
|
||||
/obj/item/gun/energy/chrono_gun
|
||||
name = "T.E.D. Projection Apparatus"
|
||||
@@ -114,9 +114,9 @@
|
||||
var/turf/currentpos = get_turf(src)
|
||||
var/mob/living/user = loc
|
||||
if((currentpos == startpos) && (field in view(CHRONO_BEAM_RANGE, currentpos)) && (user.mobility_flags & MOBILITY_STAND) && (user.stat == CONSCIOUS))
|
||||
return 1
|
||||
return TRUE
|
||||
field_disconnect(F)
|
||||
return 0
|
||||
return FALSE
|
||||
|
||||
/obj/item/gun/energy/chrono_gun/proc/pass_mind(datum/mind/M)
|
||||
if(TED)
|
||||
@@ -254,7 +254,7 @@
|
||||
return BULLET_ACT_HIT
|
||||
|
||||
/obj/structure/chrono_field/assume_air()
|
||||
return 0
|
||||
return FALSE
|
||||
|
||||
/obj/structure/chrono_field/return_air() //we always have nominal air and temperature
|
||||
var/datum/gas_mixture/GM = new
|
||||
|
||||
Reference in New Issue
Block a user