cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into toml-config

Browse Source
This commit is contained in:
AffectedArc07
2021-06-23 08:44:32 +00:00
committed by GitHub
parent fd06f8c9f8 93a0b15834
commit ed11899f11
243 changed files with 925 additions and 910 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/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
+1 -1
View File
@@ -125,7 +125,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/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/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/grille.dm
+7 -6
View File
@@ -126,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
@@ -183,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)
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/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/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/tables_racks.dm
+9 -7
View File
@@ -108,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
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
+3
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?
code/game/objects/structures/window.dm
+1 -1
View File
@@ -410,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)