cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

megaphone inhands and some cleanup (#10892)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2021-02-01 09:37:18 +01:00
committed by GitHub
parent 2d912541ff
commit 5aba6a91b9
41 changed files with 276 additions and 184 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
@@ -341,8 +341,8 @@
)
else
attack_hand(user)
else if(istype(W, /obj/item/hand_labeler))
var/obj/item/hand_labeler/HL = W
else if(istype(W, /obj/item/device/hand_labeler))
var/obj/item/device/hand_labeler/HL = W
if (HL.mode == 1)
return
else
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+1
View File
@@ -47,6 +47,7 @@
new /obj/item/modular_computer/handheld/custom_loadout/advanced/cargo_delivery(src)
new /obj/item/export_scanner(src)
new /obj/item/device/orbital_dropper/drill(src)
new /obj/item/device/megaphone/cargo(src)
/obj/structure/closet/secure_closet/merchant
name = "merchant locker"
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+1
View File
@@ -27,6 +27,7 @@
new /obj/item/clothing/shoes/brown(src)
new /obj/item/device/radio/headset/heads/ce(src)
new /obj/item/device/radio/headset/heads/ce/alt(src)
new /obj/item/device/megaphone/engi(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1
View File
@@ -111,6 +111,7 @@
new /obj/item/clothing/gloves/latex/nitrile(src)
new /obj/item/device/radio/headset/heads/cmo(src)
new /obj/item/device/radio/headset/heads/cmo/alt(src)
new /obj/item/device/megaphone/med(src)
new /obj/item/device/flash(src)
new /obj/item/reagent_containers/hypospray/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1
View File
@@ -68,3 +68,4 @@
new /obj/item/clothing/gloves/latex/nitrile(src)
new /obj/item/device/radio/headset/heads/rd(src)
new /obj/item/device/radio/headset/heads/rd/alt(src)
new /obj/item/device/megaphone/sci(src)
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+2 -2
View File
@@ -148,8 +148,8 @@
playsound(loc, W.usesound, 50, 1)
wrenched = 1
anchored = 1
else if(istype(W, /obj/item/hand_labeler))
var/obj/item/hand_labeler/HL = W
else if(istype(W, /obj/item/device/hand_labeler))
var/obj/item/device/hand_labeler/HL = W
if (HL.mode == 1)
return
else
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+3
View File
@@ -20,6 +20,7 @@
//Tools
new /obj/item/device/radio/headset/heads/captain(src)
new /obj/item/device/radio/headset/heads/captain/alt(src)
new /obj/item/device/megaphone/command(src)
new /obj/item/gun/energy/disruptorpistol(src)
new /obj/item/device/flash(src)
new /obj/item/melee/telebaton(src)
@@ -76,6 +77,7 @@
//Tools
new /obj/item/device/radio/headset/heads/hop(src)
new /obj/item/device/radio/headset/heads/hop/alt(src)
new /obj/item/device/megaphone/command(src)
new /obj/item/gun/energy/disruptorpistol(src)
new /obj/item/gun/projectile/sec/flash(src)
new /obj/item/device/flash(src)
@@ -139,6 +141,7 @@
//Tools
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/device/radio/headset/heads/hos/alt(src)
new /obj/item/device/megaphone/sec(src)
new /obj/item/storage/box/tranquilizer(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/clothing/glasses/sunglasses/sechud/head(src)
code/game/objects/structures/crates_lockers/crates.dm
+4 -4
View File
@@ -113,8 +113,8 @@
playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
rigged = 0
return
else if(istype(W, /obj/item/hand_labeler))
var/obj/item/hand_labeler/HL = W
else if(istype(W, /obj/item/device/hand_labeler))
var/obj/item/device/hand_labeler/HL = W
if (HL.mode == 1)
return
else
@@ -327,8 +327,8 @@
return ..()
if(istype(W, /obj/item/melee/energy/blade))
emag_act(INFINITY, user)
if(istype(W, /obj/item/hand_labeler))
var/obj/item/hand_labeler/HL = W
if(istype(W, /obj/item/device/hand_labeler))
var/obj/item/device/hand_labeler/HL = W
if (HL.mode == 1)
return
else if(!opened)