cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-8298

Browse Source
This commit is contained in:
Novacat
2022-03-22 08:53:45 -04:00
committed by GitHub
parent 997b44be91 1b0bd0d1a3
commit 4dbc7fe6bf
218 changed files with 4106 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/extinguisher.dm
+1 -1
View File
@@ -47,7 +47,7 @@
force = 3.0
max_water = 600
spray_particles = 3
sprite_name = "atmo_extinguisher"
sprite_name = "atmos_extinguisher"
rand_overlays = 0
/obj/item/weapon/extinguisher/Initialize()
code/game/objects/items/weapons/storage/belt.dm
+6 -3
View File
@@ -72,7 +72,8 @@
/obj/item/device/integrated_electronics/wirer,
/obj/item/device/integrated_electronics/debugger, //Vorestation edit adding debugger to toolbelt can hold list
/obj/item/weapon/shovel/spade, //VOREStation edit. If it can hold minihoes and hatchers, why not the gardening spade?
/obj/item/stack/nanopaste //VOREStation edit. Think of it as a tube of superglue. Belts hold that all the time.
/obj/item/stack/nanopaste, //VOREStation edit. Think of it as a tube of superglue. Belts hold that all the time.
/obj/item/device/geiger //VOREStation edit. Engineers work with rad-slinging stuff sometimes too
)
/obj/item/weapon/storage/belt/utility/full
@@ -102,7 +103,9 @@
/obj/item/weapon/tool/wrench,
/obj/item/weapon/weldingtool,
/obj/item/weapon/tool/crowbar,
/obj/item/weapon/tool/wirecutters
/obj/item/weapon/tool/wirecutters,
/obj/item/device/analyzer, //Vorestation edit. Gives atmos techs a few extra tools fitting their job from the start
/obj/item/weapon/extinguisher/mini //Vorestation edit. As above, the mini's much more handy to have rather than lugging a big one around
)
/obj/item/weapon/storage/belt/utility/chief
@@ -538,4 +541,4 @@
storage_slots = 8
can_hold = list(
/obj/item/ammo_casing/afoam_dart
)
)
code/game/objects/items/weapons/storage/toolbox_vr.dm
+2 -1
View File
@@ -7,4 +7,5 @@
max_storage_space = ITEMSIZE_COST_SMALL * 6
/obj/item/weapon/storage/toolbox/lunchbox/survival/zaddat
starts_with = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 6)
name = "zaddat survival lunchbox"
starts_with = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 6)
code/game/objects/items/weapons/tape.dm
+2 -2
View File
@@ -12,7 +12,7 @@
/obj/item/weapon/tape_roll/proc/can_place(var/mob/living/carbon/human/H, var/mob/user)
if(istype(user, /mob/living/silicon/robot) || user == H)
return TRUE
for (var/obj/item/weapon/grab/G in H.grabbed_by)
if (G.loc == user && G.state >= GRAB_AGGRESSIVE)
return TRUE
@@ -36,7 +36,7 @@
to_chat(user, "<span class='warning'>\The [H] doesn't have any eyes.</span>")
return
if(H.glasses)
to_chat(user, "<span class='warning'>\The [H] is already wearing somethign on their eyes.</span>")
to_chat(user, "<span class='warning'>\The [H] is already wearing something on their eyes.</span>")
return
if(H.head && (H.head.body_parts_covered & FACE))
to_chat(user, "<span class='warning'>Remove their [H.head] first.</span>")