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

Merge remote-tracking branch 'upstream/master' into brass

Browse Source
This commit is contained in:
SabreML
2021-08-04 19:32:12 +01:00
parent 4a3a726c76 3a284ec0b3
commit bb82a58c8f
699 changed files with 32075 additions and 47550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+1 -1
View File
@@ -24,7 +24,7 @@
var/oldloc = loc
step(src, direction)
if(oldloc != loc)
addtimer(CALLBACK(src, .proc/ResetMoveDelay), config.walk_speed)
addtimer(CALLBACK(src, .proc/ResetMoveDelay), GLOB.configuration.movement.base_walk_speed)
else
move_delay = FALSE
code/game/objects/structures/crates_lockers/closets/secure/security.dm
-1
View File
@@ -118,7 +118,6 @@
new /obj/item/storage/lockbox/mindshield(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/holosign_creator/security(src)
new /obj/item/clothing/mask/gas/sechailer/hos(src)
new /obj/item/shield/riot/tele(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/storage/belt/security/sec(src)
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+2 -2
View File
@@ -71,18 +71,18 @@
icon_opened = "fireclosetopen"
/obj/structure/closet/firecloset/populate_contents()
new /obj/item/extinguisher(src)
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
/obj/structure/closet/firecloset/full/populate_contents()
new /obj/item/extinguisher(src)
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/flashlight(src)
new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
code/game/objects/structures/crates_lockers/crates.dm
+17
View File
@@ -367,6 +367,23 @@
newgas.temperature = target_temp
return newgas
/obj/structure/closet/crate/freezer/iv_storage
name = "IV storage freezer"
desc = "A freezer used to store IV bags containing various blood types."
/obj/structure/closet/crate/freezer/iv_storage/populate_contents()
new /obj/item/reagent_containers/iv_bag/blood/OMinus(src)
new /obj/item/reagent_containers/iv_bag/blood/OPlus(src)
new /obj/item/reagent_containers/iv_bag/blood/AMinus(src)
new /obj/item/reagent_containers/iv_bag/blood/APlus(src)
new /obj/item/reagent_containers/iv_bag/blood/BMinus(src)
new /obj/item/reagent_containers/iv_bag/blood/BPlus(src)
new /obj/item/reagent_containers/iv_bag/blood/random(src)
new /obj/item/reagent_containers/iv_bag/blood/random(src)
new /obj/item/reagent_containers/iv_bag/blood/random(src)
new /obj/item/reagent_containers/iv_bag/salglu(src)
new /obj/item/reagent_containers/iv_bag/slime(src)
/obj/structure/closet/crate/can
desc = "A large can, looks like a bin to me."
name = "garbage can"
code/game/objects/structures/curtains.dm
+1
View File
@@ -5,6 +5,7 @@
icon = 'icons/obj/curtain.dmi'
name = "curtain"
icon_state = "closed"
face_while_pulling = FALSE
layer = SHOWER_CLOSED_LAYER
opacity = 1
density = 0
code/game/objects/structures/engicart.dm
+1
View File
@@ -3,6 +3,7 @@
desc = "A cart for storing engineering items."
icon = 'icons/obj/engicart.dmi'
icon_state = "cart"
face_while_pulling = FALSE
anchored = 0
density = 1
var/obj/item/stack/sheet/glass/myglass = null
code/game/objects/structures/foodcart.dm
+1
View File
@@ -3,6 +3,7 @@
desc = "A cart for transporting food and drinks."
icon = 'icons/obj/foodcart.dmi'
icon_state = "cart"
face_while_pulling = FALSE
anchored = 0
density = 1
//Food slots
code/game/objects/structures/girders.dm
+8
View File
@@ -28,6 +28,11 @@
if(GIRDER_DISASSEMBLED)
. += "<span class='notice'>[src] is disassembled! You probably shouldn't be able to see this examine message.</span>"
/obj/structure/girder/detailed_examine()
return "Use metal sheets on this to build a normal wall. Adding plasteel instead will make a reinforced wall.<br>\
A false wall can be made by using a crowbar on this girder, and then adding metal or plasteel.<br>\
You can dismantle the girder with a wrench."
/obj/structure/girder/proc/refundMetal(metalAmount) //refunds metal used in construction when deconstructed
for(var/i=0;i < metalAmount;i++)
new metal_type(get_turf(src))
@@ -405,6 +410,9 @@
girderpasschance = 0
max_integrity = 350
/obj/structure/girder/reinforced/detailed_examine()
return "Add another sheet of plasteel to finish."
/obj/structure/girder/cult
name = "runed girder"
desc = "Framework made of a strange and shockingly cold metal. It doesn't seem to have any bolts."
code/game/objects/structures/grille.dm
+4
View File
@@ -21,6 +21,10 @@
var/shockcooldown = 0
var/my_shockcooldown = 1 SECONDS
/obj/structure/grille/detailed_examine()
return "A powered and knotted wire underneath this will cause the grille to shock anyone not wearing insulated gloves.<br>\
Wirecutters will turn the grille into metal rods instantly. Grilles are made with metal rods."
/obj/structure/grille/fence
var/width = 3
code/game/objects/structures/inflatable.dm
+10
View File
@@ -5,6 +5,9 @@
icon_state = "folded_wall"
w_class = WEIGHT_CLASS_NORMAL
/obj/item/inflatable/detailed_examine()
return "Inflate by using it in your hand. The inflatable barrier will inflate on your tile. To deflate it, use the 'deflate' verb."
/obj/item/inflatable/attack_self(mob/user)
playsound(loc, 'sound/items/zip.ogg', 75, 1)
to_chat(user, "<span class='notice'>You inflate [src].</span>")
@@ -25,6 +28,9 @@
var/torn = /obj/item/inflatable/torn
var/intact = /obj/item/inflatable
/obj/structure/inflatable/detailed_examine()
return "To remove these safely, use the 'deflate' verb. Hitting these with any objects will probably puncture and break it forever."
/obj/structure/inflatable/Initialize(location)
..()
air_update_turf(TRUE)
@@ -104,6 +110,10 @@
var/state = 0 //closed, 1 == open
var/isSwitchingStates = 0
/obj/structure/inflatable/door/detailed_examine()
return "Click the door to open or close it. It only stops air while closed.<br>\
To remove these safely, use the 'deflate' verb. Hitting these with any objects will probably puncture and break it forever."
/obj/structure/inflatable/door/attack_ai(mob/user as mob) //those aren't machinery, they're just big fucking slabs of a mineral
if(isAI(user)) //so the AI can't open it
return
code/game/objects/structures/janicart.dm
+1
View File
@@ -7,6 +7,7 @@
icon_state = "cart"
anchored = 0
density = 1
face_while_pulling = FALSE
container_type = OPENCONTAINER
//copypaste sorry
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
code/game/objects/structures/lattice.dm
+4
View File
@@ -26,6 +26,10 @@
. = ..()
. += deconstruction_hints(user)
/obj/structure/lattice/detailed_examine()
return "Add a metal floor tile to build a floor on top of the lattice.<br>\
Lattices can be made by applying metal rods to a space tile."
/obj/structure/lattice/proc/deconstruction_hints(mob/user)
return "<span class='notice'>The rods look like they could be <b>cut</b>. There's space for more <i>rods</i> or a <i>tile</i>.</span>"
code/game/objects/structures/mirror.dm
+3 -6
View File
@@ -114,12 +114,9 @@
if("Body")
var/list/race_list = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin")
if(config.usealienwhitelist)
for(var/Spec in GLOB.whitelisted_species)
if(is_alien_whitelisted(H, Spec))
race_list += Spec
else
race_list += GLOB.whitelisted_species
for(var/species in GLOB.whitelisted_species)
if(is_alien_whitelisted(H, species))
race_list += species
var/datum/ui_module/appearance_changer/AC = ui_users[user]
if(!AC)
code/game/objects/structures/signs.dm
+9 -8
View File
@@ -286,33 +286,34 @@
/obj/structure/sign/medbay/alt
icon_state = "bluecross2"
/obj/structure/sign/directions
name = "direction sign"
/obj/structure/sign/directions/bridge
desc = "A direction sign, pointing out which way the Bridge is."
icon_state = "direction_bridge"
/obj/structure/sign/directions/science
name = "\improper Research Division"
desc = "A direction sign, pointing out which way the Research Division is."
icon_state = "direction_sci"
/obj/structure/sign/directions/engineering
name = "\improper Engineering Department"
desc = "A direction sign, pointing out which way the Engineering Department is."
icon_state = "direction_eng"
/obj/structure/sign/directions/security
name = "\improper Security Department"
desc = "A direction sign, pointing out which way the Security Department is."
icon_state = "direction_sec"
/obj/structure/sign/directions/medical
name = "\improper Medical Bay"
desc = "A direction sign, pointing out which way Medical Bay is."
desc = "A direction sign, pointing out which way the Medical Bay is."
icon_state = "direction_med"
/obj/structure/sign/directions/evac
name = "\improper Escape Arm"
desc = "A direction sign, pointing out which way Escape Shuttle Dock is."
desc = "A direction sign, pointing out which way the Escape Shuttle Dock is."
icon_state = "direction_evac"
/obj/structure/sign/directions/cargo
name = "\improper Cargo Department"
desc = "A direction sign, pointing out which way the Cargo Department is."
icon_state = "direction_supply"
code/game/objects/structures/spawner.dm
-12
View File
@@ -86,15 +86,3 @@
name = "basilisk den"
desc = "A den housing a nest of basilisks, bring a coat."
mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk)
/obj/structure/spawner/headcrab
name = "headcrab nest"
desc = "A living nest for headcrabs. It is moving ominously."
icon_state = "headcrab_nest"
icon = 'icons/mob/headcrab.dmi'
max_integrity = 200
max_mobs = 15
spawn_time = 600
mob_types = list(/mob/living/simple_animal/hostile/headcrab, /mob/living/simple_animal/hostile/headcrab/fast, /mob/living/simple_animal/hostile/headcrab/poison)
spawn_text = "crawls out of"
faction = list("hostile")
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+7
View File
@@ -25,6 +25,12 @@
buckle_offset = -6
var/comfort = 2 // default comfort
/obj/structure/bed/detailed_examine()
return "Click and drag yourself (or anyone) to this to buckle in. Click on this with an empty hand to undo the buckles.<br>\
<br>\
Anyone with restraints, such as handcuffs, will not be able to unbuckle themselves. They must use the Resist button, or verb, to break free of \
the buckles, instead."
/obj/structure/bed/psych
name = "psych bed"
desc = "For prime comfort during psychiatric evaluations."
@@ -64,6 +70,7 @@
name = "roller bed"
icon = 'icons/obj/rollerbed.dmi'
icon_state = "down"
face_while_pulling = FALSE
resistance_flags = NONE
anchored = FALSE
comfort = 1
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+2 -1
View File
@@ -11,6 +11,7 @@
max_integrity = 250
integrity_failure = 25
buckle_offset = 0
face_while_pulling = FALSE
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 1
var/item_chair = /obj/item/chair // if null it can't be picked up
@@ -116,7 +117,7 @@
set category = "Object"
set src in oview(1)
if(config.ghost_interaction)
if(GLOB.configuration.general.ghost_interaction)
setDir(turn(dir, 90))
handle_rotation()
return
code/game/objects/structures/watercloset.dm
+1 -1
View File
@@ -404,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)