mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
MERGE SHIT REEEEE IMMAH PUNCH A WALL
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
anchored = 1
|
||||
health = 200
|
||||
req_access = list()
|
||||
layer = 2.9 // ensures the loot they drop always appears on top of them.
|
||||
var/is_armory = FALSE
|
||||
var/ignore_use = FALSE
|
||||
|
||||
|
||||
@@ -245,6 +245,7 @@
|
||||
new /obj/item/restraints/handcuffs(src)
|
||||
new /obj/item/melee/baton/loaded(src)
|
||||
new /obj/item/clothing/glasses/sunglasses(src)
|
||||
new /obj/item/clothing/glasses/hud/security/sunglasses/read_only(src)
|
||||
new /obj/item/clothing/glasses/hud/health/health_advanced
|
||||
new /obj/item/clothing/head/beret/centcom/officer(src)
|
||||
new /obj/item/clothing/head/beret/centcom/officer/navy(src)
|
||||
|
||||
@@ -637,3 +637,8 @@
|
||||
icon_state = "electricalcrate"
|
||||
icon_opened = "electricalcrateopen"
|
||||
icon_closed = "electricalcrate"
|
||||
|
||||
/obj/structure/closet/crate/tape/New()
|
||||
if(prob(10))
|
||||
new /obj/item/bikehorn/rubberducky(src)
|
||||
..()
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
var/area/syndicate_depot/core/depotarea
|
||||
var/has_overloaded = FALSE
|
||||
|
||||
/obj/structure/fusionreactor/Initialize()
|
||||
..()
|
||||
/obj/structure/fusionreactor/New()
|
||||
. = ..()
|
||||
// Do not attempt to put the code below into Initialize() or even LateInitialize() with a "return INITIALIZE_HINT_LATELOAD". It won't work!
|
||||
depotarea = areaMaster
|
||||
if(istype(depotarea))
|
||||
depotarea.reactor = src
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/structure/fusionreactor/LateInitialize()
|
||||
for(var/obj/machinery/porta_turret/syndicate/T in range(50, loc))
|
||||
if(!istype(T.depotarea))
|
||||
T.depotarea = depotarea
|
||||
for(var/obj/machinery/porta_turret/syndicate/T in range(50, loc))
|
||||
if(!istype(T.depotarea))
|
||||
T.depotarea = depotarea
|
||||
else
|
||||
log_debug("[src] at [x],[y],[z] failed depotarea istype check during New()! Either it was spawned outside the depot area (bad idea), or a bug is happening.")
|
||||
|
||||
/obj/structure/fusionreactor/Destroy()
|
||||
if(istype(depotarea))
|
||||
@@ -84,8 +84,9 @@
|
||||
var/max_fire_range = 9
|
||||
var/area/syndicate_depot/core/depotarea
|
||||
|
||||
/obj/effect/overload/Initialize()
|
||||
/obj/effect/overload/New()
|
||||
. = ..()
|
||||
// Do not attempt to put the code below into Initialize() or even LateInitialize() with a "return INITIALIZE_HINT_LATELOAD". It won't work!
|
||||
processing_objects.Add(src)
|
||||
depotarea = areaMaster
|
||||
if(istype(depotarea))
|
||||
@@ -93,6 +94,8 @@
|
||||
depotarea.used_self_destruct = TRUE // Silences all further alerts from this point onwards.
|
||||
depotarea.updateicon()
|
||||
depotarea.shields_down()
|
||||
else
|
||||
log_debug("[src] at [x],[y],[z] failed depotarea istype check during New()! Either it was spawned outside the depot area (bad idea), or a bug is happening.")
|
||||
|
||||
/obj/effect/overload/process()
|
||||
var/turf/T = get_turf(src)
|
||||
@@ -116,6 +119,8 @@
|
||||
L.open()
|
||||
for(var/mob/living/M in range(30, T))
|
||||
M.gib()
|
||||
for(var/obj/mecha/E in range(30, T))
|
||||
E.Destroy()
|
||||
explosion(get_turf(src), 25, 35, 45, 55, 1, 1, 60, 0, 0)
|
||||
processing_objects.Remove(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -107,6 +107,7 @@ var/global/list/captain_display_cases = list()
|
||||
var/image/occupant_overlay = null
|
||||
var/obj/item/airlock_electronics/circuit
|
||||
var/start_showpiece_type = null //add type for items on display
|
||||
var/alarm_needs_power = TRUE
|
||||
|
||||
/obj/structure/displaycase/New()
|
||||
. = ..()
|
||||
@@ -191,7 +192,12 @@ var/global/list/captain_display_cases = list()
|
||||
playsound(get_turf(src), "shatter", 70, 1)
|
||||
update_icon()
|
||||
spawn(0)
|
||||
burglar_alarm()
|
||||
if(!alarm_needs_power)
|
||||
burglar_alarm()
|
||||
else
|
||||
var/area/a = get_area(src)
|
||||
if(isarea(a) && a.power_equip)
|
||||
burglar_alarm()
|
||||
else
|
||||
playsound(get_turf(src), 'sound/effects/Glasshit.ogg', 75, 1)
|
||||
return
|
||||
|
||||
@@ -174,7 +174,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
|
||||
user.changeNext_move(CLICK_CD_MELEE)
|
||||
user.visible_message("<span class='notice'>Something knocks on [src].</span>")
|
||||
add_fingerprint(user)
|
||||
playsound(src, 'sound/effects/Glassknock.ogg', 50, 1)
|
||||
playsound(src, 'sound/effects/glassknock.ogg', 50, 1)
|
||||
|
||||
/obj/structure/window/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
|
||||
if(!can_be_reached(user))
|
||||
|
||||
Reference in New Issue
Block a user