cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into just-defibrillator-things

Browse Source
This commit is contained in:
E-MonaRhg
2021-07-09 00:03:38 +02:00
parent abef5e648f d85f2261e5
commit c303a2b3f2
632 changed files with 15669 additions and 22631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+2 -2
View File
@@ -27,7 +27,7 @@
// Please dont override this unless you absolutely have to
/obj/structure/closet/Initialize(mapload)
. = ..()
if(!opened)
if(mapload && !opened)
// Youre probably asking, why is this a 0 seconds timer AA?
// Well, I will tell you. One day, all /obj/effect/spawner will use Initialize
// This includes maint loot spawners. The problem with that is if a closet loads before a spawner,
@@ -327,7 +327,7 @@
//okay, so the closet is either welded or locked... resist!!!
to_chat(L, "<span class='warning'>You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)</span>")
for(var/mob/O in viewers(usr.loc))
O.show_message("<span class='danger'>The [src] begins to shake violently!</span>", 1)
O.show_message("<span class='danger'>[src] begins to shake violently!</span>", 1)
spawn(0)
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+4 -4
View File
@@ -102,7 +102,7 @@
if(localopened)
if(fireaxe)
user.put_in_hands(fireaxe)
to_chat(user, "<span class='notice'>You take \the [fireaxe] from the [src].</span>")
to_chat(user, "<span class='notice'>You take \the [fireaxe] from [src].</span>")
fireaxe = null
add_fingerprint(user)
@@ -157,12 +157,12 @@
if(localopened)
if(fireaxe)
usr.put_in_hands(fireaxe)
to_chat(usr, "<span class='notice'>You take \the [fireaxe] from the [src].</span>")
to_chat(usr, "<span class='notice'>You take \the [fireaxe] from [src].</span>")
fireaxe = null
else
to_chat(usr, "<span class='notice'>The [src] is empty.</span>")
to_chat(usr, "<span class='notice'>[src] is empty.</span>")
else
to_chat(usr, "<span class='notice'>The [src] is closed.</span>")
to_chat(usr, "<span class='notice'>[src] is closed.</span>")
update_icon()
/obj/structure/closet/fireaxecabinet/attack_ai(mob/user as mob)
code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm
+1
View File
@@ -22,6 +22,7 @@
new /obj/item/storage/backpack/cultpack(src)
new /obj/item/clothing/head/helmet/riot/knight/templar(src)
new /obj/item/clothing/suit/armor/riot/knight/templar(src)
new /obj/item/clothing/suit/storage/labcoat(src)
new /obj/item/soulstone/anybody/purified/chaplain(src)
new /obj/item/storage/fancy/candle_box/eternal(src)
new /obj/item/storage/fancy/candle_box/eternal(src)
code/game/objects/structures/crates_lockers/closets/secure/depot.dm
+2 -2
View File
@@ -32,13 +32,13 @@
/obj/structure/closet/secure_closet/syndicate/depot/attack_animal(mob/M)
if(isanimal(M) && ("syndicate" in M.faction))
to_chat(M, "<span class='warning'>The [src] resists your attack!</span>")
to_chat(M, "<span class='warning'>[src] resists your attack!</span>")
return
return ..()
/obj/structure/closet/secure_closet/syndicate/depot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/rcs))
to_chat(user, "<span class='warning'>Bluespace interference prevents the [W] from locking onto [src]!</span>")
to_chat(user, "<span class='warning'>Bluespace interference prevents [W] from locking onto [src]!</span>")
return
return ..()
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+4 -3
View File
@@ -69,7 +69,8 @@
togglelock(user)
/obj/structure/closet/secure_closet/AltClick(mob/user)
..()
if(opened)
return ..()
if(Adjacent(user))
togglelock(user)
@@ -79,7 +80,7 @@
locked = FALSE
icon_state = icon_off
flick(icon_broken, src)
to_chat(user, "<span class='notice'>You break the lock on \the [src].</span>")
to_chat(user, "<span class='notice'>You break the lock on [src].</span>")
/obj/structure/closet/secure_closet/attack_hand(mob/user)
add_fingerprint(user)
@@ -126,7 +127,7 @@
//okay, so the closet is either welded or locked... resist!!!
to_chat(L, "<span class='warning'>You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)</span>")
for(var/mob/O in viewers(src))
O.show_message("<span class='danger'>The [src] begins to shake violently!</span>", 1)
O.show_message("<span class='danger'>[src] begins to shake violently!</span>", 1)
spawn(0)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+3 -2
View File
@@ -23,7 +23,7 @@
/obj/structure/closet/syndicate/suits/populate_contents()
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/clothing/suit/space/hardsuit/syndi(src)
new /obj/item/tank/jetpack/oxygen/harness(src)
new /obj/item/tank/internals/oxygen/red(src)
/obj/structure/closet/syndicate/nuclear
desc = "It's a storage unit for a Syndicate boarding party."
@@ -37,6 +37,7 @@
new /obj/item/storage/box/teargas(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/backpack/duffel/syndie/med(src)
new /obj/item/tank/jetpack/oxygen/harness(src)
new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
@@ -50,7 +51,7 @@
/obj/structure/closet/syndicate/sst/populate_contents()
new /obj/item/ammo_box/magazine/mm556x45(src)
new /obj/item/gun/projectile/automatic/l6_saw(src)
new /obj/item/tank/jetpack/oxygen/harness(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/storage/belt/military/sst(src)
new /obj/item/clothing/glasses/thermal(src)
new /obj/item/clothing/shoes/magboots/syndie/advance(src)
code/game/objects/structures/depot.dm
+1 -1
View File
@@ -50,7 +50,7 @@
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
to_chat(user, "<span class='notice'>The [src] is too well secured to the floor.</span>")
to_chat(user, "<span class='notice'>[src] is too well secured to the floor.</span>")
/obj/structure/fusionreactor/proc/overload(containment_failure = FALSE, skip_qdel = FALSE)
if(has_overloaded)
code/game/objects/structures/displaycase.dm
+10 -1
View File
@@ -35,10 +35,19 @@
QDEL_NULL(showpiece)
return ..()
/obj/structure/displaycase/emag_act(mob/user)
if(!emagged)
to_chat(user, "<span class='warning'>You override the ID lock on [src].</span>")
trigger_alarm()
emagged = TRUE
/obj/structure/displaycase/examine(mob/user)
. = ..()
if(alert)
. += "<span class='notice'>Hooked up with an anti-theft system.</span>"
if(emagged)
. += "<span class='warning'>The ID lock has been shorted out.</span>"
if(showpiece)
. += "<span class='notice'>There's [showpiece] inside.</span>"
if(trophy_message)
@@ -100,7 +109,7 @@
/obj/structure/displaycase/attackby(obj/item/I, mob/user, params)
if(I.GetID() && !broken && openable)
if(allowed(user))
if(allowed(user) || emagged)
to_chat(user, "<span class='notice'>You [open ? "close":"open"] [src].</span>")
toggle_lock(user)
else
code/game/objects/structures/door_assembly.dm
+2 -2
View File
@@ -226,7 +226,7 @@
return
if(mineral)
var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]")
visible_message("<span class='notice'>[user] welds the [mineral] plating off [src].</span>",\
user.visible_message("<span class='notice'>[user] welds the [mineral] plating off [src].</span>",\
"<span class='notice'>You start to weld the [mineral] plating off [src]...</span>",\
"<span class='warning'>You hear welding.</span>")
if(!I.use_tool(src, user, 40, volume = I.tool_volume))
@@ -236,7 +236,7 @@
var/obj/structure/door_assembly/PA = new previous_assembly(loc)
transfer_assembly_vars(src, PA)
else if(glass)
visible_message("<span class='notice'>[user] welds the glass panel out of [src].</span>",\
user.visible_message("<span class='notice'>[user] welds the glass panel out of [src].</span>",\
"<span class='notice'>You start to weld the glass panel out of the [src]...</span>",\
"<span class='warning'>You hear welding.</span>")
if(!I.use_tool(src, user, 40, volume = I.tool_volume))
code/game/objects/structures/false_walls.dm
-4
View File
@@ -51,10 +51,6 @@
if(0 to 40)
return "<span class='danger'>It looks heavily damaged.</span>"
/obj/structure/falsewall/ratvar_act()
new /obj/structure/falsewall/brass(loc)
qdel(src)
/obj/structure/falsewall/Destroy()
density = 0
air_update_turf(1)
code/game/objects/structures/grille.dm
+7 -16
View File
@@ -55,13 +55,6 @@
if(!anchored)
. += "<span class='notice'>The anchoring screws are <i>unscrewed</i>. The rods look like they could be <b>cut</b> through.</span>"
/obj/structure/grille/ratvar_act()
if(broken)
new /obj/structure/grille/ratvar/broken(loc)
else
new /obj/structure/grille/ratvar(loc)
qdel(src)
/obj/structure/grille/Bumped(atom/user)
if(ismob(user))
if(!(shockcooldown <= world.time))
@@ -133,11 +126,12 @@
return ..()
/obj/structure/grille/proc/repair(mob/user, obj/item/stack/rods/R)
user.visible_message("<span class='notice'>[user] rebuilds the broken grille.</span>",
"<span class='notice'>You rebuild the broken grille.</span>")
new grille_type(loc)
R.use(1)
qdel(src)
if(R.get_amount() >= 1)
user.visible_message("<span class='notice'>[user] rebuilds the broken grille.</span>",
"<span class='notice'>You rebuild the broken grille.</span>")
new grille_type(loc)
R.use(1)
qdel(src)
/obj/structure/grille/wirecutter_act(mob/user, obj/item/I)
. = TRUE
@@ -190,7 +184,7 @@
W.update_nearby_icons()
W.state = WINDOW_OUT_OF_FRAME
S.use(2)
to_chat(user, "<span class='notice'>You place the [W] on [src].</span>")
to_chat(user, "<span class='notice'>You place [W] on [src].</span>")
/obj/structure/grille/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
@@ -289,9 +283,6 @@
color = "#960000"
animate(src, color = previouscolor, time = 8)
/obj/structure/grille/ratvar/ratvar_act()
return
/obj/structure/grille/ratvar/broken
icon_state = "brokenratvargrille"
density = FALSE
code/game/objects/structures/guillotine.dm
+1 -1
View File
@@ -216,7 +216,7 @@
/obj/structure/guillotine/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
if(!anchored)
to_chat(usr, "<span class='warning'>The [src] needs to be wrenched to the floor!</span>")
to_chat(usr, "<span class='warning'>[src] needs to be wrenched to the floor!</span>")
return FALSE
if(!ishuman(M))
code/game/objects/structures/lattice.dm
-24
View File
@@ -61,18 +61,6 @@
/obj/structure/lattice/clockwork/Initialize(mapload)
. = ..()
ratvar_act()
/obj/structure/lattice/clockwork/ratvar_act()
if((x + y) % 2 != 0)
icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
pixel_x = -9
pixel_y = -9
else
icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
pixel_x = 0
pixel_y = 0
return TRUE
/obj/structure/lattice/catwalk
name = "catwalk"
@@ -109,18 +97,6 @@
/obj/structure/lattice/catwalk/clockwork/Initialize(mapload)
. = ..()
ratvar_act()
if(!mapload)
new /obj/effect/temp_visual/ratvar/floor/catwalk(loc)
new /obj/effect/temp_visual/ratvar/beam/catwalk(loc)
/obj/structure/lattice/catwalk/clockwork/ratvar_act()
if((x + y) % 2 != 0)
icon = 'icons/obj/smooth_structures/catwalk_clockwork_large.dmi'
pixel_x = -9
pixel_y = -9
else
icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
pixel_x = 0
pixel_y = 0
return TRUE
code/game/objects/structures/loom.dm
+2 -2
View File
@@ -45,12 +45,12 @@
if(W.amount < FABRIC_PER_SHEET)
user.show_message("<span class='notice'>You need at least [FABRIC_PER_SHEET] units of fabric before using this.</span>", 1)
return FALSE
user.show_message("<span class='notice'>You start weaving \the [W.name] through the loom..</span>", 1)
user.show_message("<span class='notice'>You start weaving [W] through the loom...</span>", 1)
if(do_after(user, W.pull_effort, target = src))
if(W.amount >= FABRIC_PER_SHEET)
new W.loom_result(drop_location())
W.use(FABRIC_PER_SHEET)
user.show_message("<span class='notice'>You weave \the [W.name] into a workable fabric.</span>", 1)
user.show_message("<span class='notice'>You weave [W] into a workable fabric.</span>", 1)
return TRUE
#undef FABRIC_PER_SHEET
code/game/objects/structures/safe.dm
+1 -1
View File
@@ -402,7 +402,7 @@ GLOBAL_LIST_EMPTY(safes)
for(var/safe in GLOB.safes)
var/obj/structure/safe/S = safe
if(owner in S.known_by)
info += "<br> The combination for the safe located in the [get_area(S).name] is: [S.get_combination()]<br>"
info += "<br> The combination for the safe located in the [get_area_name(S, TRUE)] is: [S.get_combination()]<br>"
info_links = info
update_icon()
code/game/objects/structures/spirit_board.dm
+1 -1
View File
@@ -74,7 +74,7 @@
users_in_range++
if(users_in_range < 2)
to_chat(M, "<span class='warning'>There aren't enough people to use the [src.name]!</span>")
to_chat(M, "<span class='warning'>There aren't enough people to use [src]!</span>")
return 0
return 1
code/game/objects/structures/statues.dm
-3
View File
@@ -46,9 +46,6 @@
user.visible_message("[user] rubs some dust off from the [name]'s surface.", \
"<span class='notice'>You rub some dust off from the [name]'s surface.</span>")
/obj/structure/statue/CanAtmosPass()
return !density
/obj/structure/statue/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT))
if(material_drop_type)
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
-8
View File
@@ -24,11 +24,6 @@
W.setDir(dir)
qdel(src)
/obj/structure/chair/ratvar_act()
var/obj/structure/chair/brass/B = new(get_turf(src))
B.setDir(dir)
qdel(src)
/obj/structure/chair/Move(atom/newloc, direct)
..()
handle_rotation()
@@ -441,9 +436,6 @@
if(turns >= 8)
STOP_PROCESSING(SSfastprocess, src)
/obj/structure/chair/brass/ratvar_act()
return
/obj/structure/chair/brass/AltClick(mob/living/user)
turns = 0
if(!istype(user) || user.incapacitated() || !in_range(src, user))
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+3
View File
@@ -156,3 +156,6 @@
else
. = 1
/obj/structure/chair/wheelchair/bike/wrench_act(mob/user, obj/item/I)
return
code/game/objects/structures/table_frames.dm
-4
View File
@@ -91,10 +91,6 @@
new /obj/structure/table_frame/wood(loc)
qdel(src)
/obj/structure/table_frame/ratvar_act()
new /obj/structure/table_frame/brass(loc)
qdel(src)
/*
* Wooden Frames
*/
code/game/objects/structures/tables_racks.dm
+9 -17
View File
@@ -84,10 +84,6 @@
new /obj/structure/table/wood(loc)
qdel(src)
/obj/structure/table/ratvar_act()
new /obj/structure/table/reinforced/brass(loc)
qdel(src)
/obj/structure/table/do_climb(mob/living/user)
. = ..()
item_placed(user)
@@ -112,25 +108,27 @@
/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0)
if(height == 0)
return 1
return TRUE
if(istype(mover,/obj/item/projectile))
return (check_cover(mover,target))
if(ismob(mover))
var/mob/M = mover
if(M.flying)
return 1
return TRUE
if(istype(mover) && mover.checkpass(PASSTABLE))
return 1
return TRUE
if(mover.throwing)
return 1
return TRUE
if(length(get_atoms_of_type(get_turf(mover), /obj/structure/table) - mover))
return 1
var/obj/structure/table/T = locate(/obj/structure/table) in get_turf(mover)
if(!T.flipped)
return TRUE
if(flipped)
if(get_dir(loc, target) == dir)
return !density
else
return 1
return 0
return TRUE
return FALSE
/obj/structure/table/CanAStarPass(ID, dir, caller)
. = !density
@@ -571,9 +569,6 @@
color = "#960000"
animate(src, color = previouscolor, time = 8)
/obj/structure/table/reinforced/brass/ratvar_act()
obj_integrity = max_integrity
/obj/structure/table/tray
name = "surgical tray"
desc = "A small metal tray with wheels."
@@ -637,9 +632,6 @@
/obj/structure/table/tray/narsie_act()
return 0
/obj/structure/table/tray/ratvar_act()
return 0
/*
* Racks
*/
code/game/objects/structures/transit_tubes/station.dm
+1 -1
View File
@@ -79,7 +79,7 @@
if(ismob(G.affecting) && G.state >= GRAB_AGGRESSIVE)
var/mob/GM = G.affecting
for(var/obj/structure/transit_tube_pod/pod in loc)
pod.visible_message("<span class='warning'>[user] starts putting [GM] into the [pod]!</span>")
pod.visible_message("<span class='warning'>[user] starts putting [GM] into [pod]!</span>")
if(do_after(user, 30, target = GM) && GM && G && G.affecting == GM)
GM.Weaken(5)
Bumped(GM)
code/game/objects/structures/watercloset.dm
+4 -1
View File
@@ -275,6 +275,9 @@
/obj/machinery/shower/Destroy()
QDEL_NULL(soundloop)
var/obj/effect/mist/mist = locate() in loc
if(!QDELETED(mist))
QDEL_IN(mist, 25 SECONDS)
return ..()
//add heat controls? when emagged, you can freeze to death in it?
@@ -401,7 +404,7 @@
tile.water_act(100, convertHeat(), src)
tile.clean_blood(radiation_clean = TRUE)
for(var/obj/effect/E in tile)
if(is_cleanable(E))
if(E.is_cleanable())
qdel(E)
for(var/A in loc)
wash(A)
code/game/objects/structures/window.dm
+4 -13
View File
@@ -72,13 +72,6 @@
/obj/structure/window/narsie_act()
color = NARSIE_WINDOW_COLOUR
/obj/structure/window/ratvar_act()
if(!fulltile)
new/obj/structure/window/reinforced/clockwork(get_turf(src), dir)
else
new/obj/structure/window/reinforced/clockwork/fulltile(get_turf(src))
qdel(src)
/obj/structure/window/rpd_act()
return
@@ -243,6 +236,7 @@
if(!I.use_tool(src, user, decon_speed, volume = I.tool_volume, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
return
anchored = !anchored
air_update_turf(TRUE)
update_nearby_icons()
to_chat(user, "<span class='notice'>You [anchored ? "fasten the frame to":"unfasten the frame from"] the floor.</span>")
@@ -397,7 +391,8 @@
return TRUE
/obj/structure/window/AltClick(mob/user)
if(fulltile) // Can't rotate these.
return ..()
if(user.incapacitated())
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
@@ -415,7 +410,7 @@
if(!valid_window_location(loc, target_dir))
target_dir = turn(dir, 90)
if(!valid_window_location(loc, target_dir))
to_chat(user, "<span class='warning'>There is no room to rotate the [src]</span>")
to_chat(user, "<span class='warning'>There is no room to rotate [src].</span>")
return FALSE
setDir(target_dir)
@@ -725,10 +720,6 @@
made_glow = TRUE
..()
/obj/structure/window/reinforced/clockwork/ratvar_act()
obj_integrity = max_integrity
update_nearby_icons()
/obj/structure/window/reinforced/clockwork/narsie_act()
take_damage(rand(25, 75), BRUTE)
if(src)