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

Removes Weapons (#7415)

Browse Source 
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
This commit is contained in:
Werner
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/alien/alien.dm
+1 -1
View File
@@ -48,7 +48,7 @@
/obj/structure/alien/attack_generic()
attack_hand(usr)
/obj/structure/alien/attackby(var/obj/item/weapon/W, var/mob/user)
/obj/structure/alien/attackby(var/obj/item/W, var/mob/user)
health = max(0, health - W.force)
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
healthcheck()
code/game/objects/structures/alien/node.dm
+2 -2
View File
@@ -79,7 +79,7 @@
qdel(src)
return
/obj/structure/alien/weeds/attackby(var/obj/item/weapon/W, var/mob/user)
/obj/structure/alien/weeds/attackby(var/obj/item/W, var/mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
visible_message("<span class='danger'>\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
@@ -87,7 +87,7 @@
var/damage = W.force / 4.0
if(W.iswelder())
var/obj/item/weapon/weldingtool/WT = W
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(0, user))
damage = 15
code/game/objects/structures/barsign.dm
+1 -1
View File
@@ -32,7 +32,7 @@
if(cult)
return ..()
var/obj/item/weapon/card/id/card = I.GetID()
var/obj/item/card/id/card = I.GetID()
if(istype(card))
if(access_bar in card.GetAccess())
var/sign_type = input(user, "What would you like to change the barsign to?") as null|anything in get_valid_states(0)
code/game/objects/structures/bedsheet_bin.dm
+25 -25
View File
@@ -4,7 +4,7 @@ BEDSHEETS
LINEN BINS
*/
/obj/item/weapon/bedsheet
/obj/item/bedsheet
name = "bedsheet"
desc = "A surprisingly soft linen bedsheet."
icon = 'icons/obj/bedsheets.dmi'
@@ -17,7 +17,7 @@ LINEN BINS
w_class = 2.0
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/weapon/bedsheet/attack_self(mob/user as mob)
/obj/item/bedsheet/attack_self(mob/user as mob)
user.drop_item()
if(layer == initial(layer))
layer = 5
@@ -26,63 +26,63 @@ LINEN BINS
add_fingerprint(user)
return
/obj/item/weapon/bedsheet/attackby(obj/item/I, mob/user)
/obj/item/bedsheet/attackby(obj/item/I, mob/user)
if(is_sharp(I))
user.visible_message("<span class='notice'>\The [user] begins cutting up [src] with [I].</span>", "<span class='notice'>You begin cutting up [src] with [I].</span>")
if(do_after(user, 50/I.toolspeed))
to_chat(user, "<span class='notice'>You cut [src] into pieces!</span>")
for(var/i in 1 to rand(2,5))
new /obj/item/weapon/reagent_containers/glass/rag(get_turf(src))
new /obj/item/reagent_containers/glass/rag(get_turf(src))
qdel(src)
return
..()
/obj/item/weapon/bedsheet/blue
/obj/item/bedsheet/blue
icon_state = "sheetblue"
/obj/item/weapon/bedsheet/green
/obj/item/bedsheet/green
icon_state = "sheetgreen"
/obj/item/weapon/bedsheet/orange
/obj/item/bedsheet/orange
icon_state = "sheetorange"
/obj/item/weapon/bedsheet/purple
/obj/item/bedsheet/purple
icon_state = "sheetpurple"
/obj/item/weapon/bedsheet/rainbow
/obj/item/bedsheet/rainbow
icon_state = "sheetrainbow"
/obj/item/weapon/bedsheet/red
/obj/item/bedsheet/red
icon_state = "sheetred"
/obj/item/weapon/bedsheet/yellow
/obj/item/bedsheet/yellow
icon_state = "sheetyellow"
/obj/item/weapon/bedsheet/mime
/obj/item/bedsheet/mime
icon_state = "sheetmime"
/obj/item/weapon/bedsheet/clown
/obj/item/bedsheet/clown
icon_state = "sheetclown"
/obj/item/weapon/bedsheet/captain
/obj/item/bedsheet/captain
icon_state = "sheetcaptain"
/obj/item/weapon/bedsheet/rd
/obj/item/bedsheet/rd
icon_state = "sheetrd"
/obj/item/weapon/bedsheet/medical
/obj/item/bedsheet/medical
icon_state = "sheetmedical"
/obj/item/weapon/bedsheet/hos
/obj/item/bedsheet/hos
icon_state = "sheethos"
/obj/item/weapon/bedsheet/hop
/obj/item/bedsheet/hop
icon_state = "sheethop"
/obj/item/weapon/bedsheet/ce
/obj/item/bedsheet/ce
icon_state = "sheetce"
/obj/item/weapon/bedsheet/brown
/obj/item/bedsheet/brown
icon_state = "sheetbrown"
@@ -117,7 +117,7 @@ LINEN BINS
/obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/weapon/bedsheet))
if(istype(I, /obj/item/bedsheet))
user.drop_from_inventory(I,src)
sheets.Add(I)
amount++
@@ -131,13 +131,13 @@ LINEN BINS
if(amount >= 1)
amount--
var/obj/item/weapon/bedsheet/B
var/obj/item/bedsheet/B
if(sheets.len > 0)
B = sheets[sheets.len]
sheets.Remove(B)
else
B = new /obj/item/weapon/bedsheet(loc)
B = new /obj/item/bedsheet(loc)
B.forceMove(user.loc)
user.put_in_hands(B)
@@ -155,13 +155,13 @@ LINEN BINS
if(amount >= 1)
amount--
var/obj/item/weapon/bedsheet/B
var/obj/item/bedsheet/B
if(sheets.len > 0)
B = sheets[sheets.len]
sheets.Remove(B)
else
B = new /obj/item/weapon/bedsheet(loc)
B = new /obj/item/bedsheet(loc)
B.forceMove(loc)
to_chat(user, "<span class='notice'>You telekinetically remove [B] from [src].</span>")
code/game/objects/structures/crates_lockers/closets.dm
+7 -7
View File
@@ -218,16 +218,16 @@
..()
damage(proj_damage)
/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/attackby(obj/item/W as obj, mob/user as mob)
if(opened)
if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
return 0
if(istype(W,/obj/item/tk_grab))
return 0
if(W.iswelder())
var/obj/item/weapon/weldingtool/WT = W
var/obj/item/weldingtool/WT = W
if(WT.isOn())
user.visible_message(
"<span class='warning'>[user] begins cutting [src] apart.</span>",
@@ -248,8 +248,8 @@
)
qdel(src)
return
if(istype(W, /obj/item/weapon/storage/laundry_basket) && W.contents.len)
var/obj/item/weapon/storage/laundry_basket/LB = W
if(istype(W, /obj/item/storage/laundry_basket) && W.contents.len)
var/obj/item/storage/laundry_basket/LB = W
var/turf/T = get_turf(src)
for(var/obj/item/I in LB.contents)
LB.remove_from_storage(I, T)
@@ -268,7 +268,7 @@
else if(istype(W, /obj/item/stack/packageWrap))
return
else if(W.iswelder())
var/obj/item/weapon/weldingtool/WT = W
var/obj/item/weldingtool/WT = W
if(WT.isOn())
user.visible_message(
"<span class='warning'>[user] begins welding [src] [welded ? "open" : "shut"].</span>",
code/game/objects/structures/crates_lockers/closets/coffin.dm
+3 -3
View File
@@ -5,10 +5,10 @@
icon_closed = "coffin"
icon_opened = "coffin_open"
/obj/structure/closet/coffin/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/coffin/attackby(obj/item/W as obj, mob/user as mob)
if(opened)
if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
return 0
if(istype(W,/obj/item/tk_grab))
code/game/objects/structures/crates_lockers/closets/fitness.dm
+6 -6
View File
@@ -5,8 +5,8 @@
icon_closed = "mixed"
/obj/structure/closet/athletic_mixed/fill()
new /obj/item/weapon/towel/random(src)
new /obj/item/weapon/towel/random(src)
new /obj/item/towel/random(src)
new /obj/item/towel/random(src)
new /obj/item/clothing/under/shorts/grey(src)
new /obj/item/clothing/under/shorts/black(src)
new /obj/item/clothing/under/shorts/red(src)
@@ -52,8 +52,8 @@
icon_closed = "red"
/obj/structure/closet/lasertag/red/fill()
new /obj/item/weapon/gun/energy/lasertag/red(src)
new /obj/item/weapon/gun/energy/lasertag/red(src)
new /obj/item/gun/energy/lasertag/red(src)
new /obj/item/gun/energy/lasertag/red(src)
new /obj/item/clothing/suit/redtag(src)
new /obj/item/clothing/suit/redtag(src)
@@ -65,7 +65,7 @@
icon_closed = "blue"
/obj/structure/closet/lasertag/blue/fill()
new /obj/item/weapon/gun/energy/lasertag/blue(src)
new /obj/item/weapon/gun/energy/lasertag/blue(src)
new /obj/item/gun/energy/lasertag/blue(src)
new /obj/item/gun/energy/lasertag/blue(src)
new /obj/item/clothing/suit/bluetag(src)
new /obj/item/clothing/suit/bluetag(src)
code/game/objects/structures/crates_lockers/closets/gimmick.dm
+27 -27
View File
@@ -12,10 +12,10 @@
else
icon_state = icon_opened
/obj/structure/closet/cabinet/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/cabinet/attackby(obj/item/W as obj, mob/user as mob)
if(opened)
if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
return 0
if(istype(W,/obj/item/tk_grab))
@@ -107,18 +107,18 @@
new /obj/item/clothing/suit/armor/tdome/red(src)
new /obj/item/clothing/suit/armor/tdome/red(src)
new /obj/item/clothing/suit/armor/tdome/red(src)
new /obj/item/weapon/melee/energy/sword(src)
new /obj/item/weapon/melee/energy/sword(src)
new /obj/item/weapon/melee/energy/sword(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/melee/energy/sword(src)
new /obj/item/melee/energy/sword(src)
new /obj/item/melee/energy/sword(src)
new /obj/item/gun/energy/laser(src)
new /obj/item/gun/energy/laser(src)
new /obj/item/gun/energy/laser(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
@@ -133,18 +133,18 @@
new /obj/item/clothing/suit/armor/tdome/green(src)
new /obj/item/clothing/suit/armor/tdome/green(src)
new /obj/item/clothing/suit/armor/tdome/green(src)
new /obj/item/weapon/melee/energy/sword(src)
new /obj/item/weapon/melee/energy/sword(src)
new /obj/item/weapon/melee/energy/sword(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/gun/energy/laser(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/melee/baton(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/melee/energy/sword(src)
new /obj/item/melee/energy/sword(src)
new /obj/item/melee/energy/sword(src)
new /obj/item/gun/energy/laser(src)
new /obj/item/gun/energy/laser(src)
new /obj/item/gun/energy/laser(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+19 -19
View File
@@ -49,11 +49,11 @@
new /obj/item/clothing/under/waiter(src)
new /obj/item/clothing/under/waiter(src)
if(prob(1))
new /obj/item/weapon/gun/energy/mousegun(src)
new /obj/item/gun/energy/mousegun(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/weapon/storage/box/gloves(src)
new /obj/item/weapon/storage/box/mousetraps(src)
new /obj/item/storage/box/gloves(src)
new /obj/item/storage/box/mousetraps(src)
new /obj/item/clothing/under/rank/chef(src)
new /obj/item/clothing/head/chefhat(src)
@@ -70,28 +70,28 @@
/obj/structure/closet/jcloset/fill()
new /obj/item/clothing/under/rank/janitor(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/weapon/cartridge/janitor(src)
new /obj/item/cartridge/janitor(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/head/soft/purple(src)
new /obj/item/weapon/gun/energy/mousegun(src)
new /obj/item/gun/energy/mousegun(src)
new /obj/item/clothing/accessory/holster/armpit(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/caution(src)
new /obj/item/weapon/caution(src)
new /obj/item/weapon/caution(src)
new /obj/item/weapon/caution(src)
new /obj/item/caution(src)
new /obj/item/caution(src)
new /obj/item/caution(src)
new /obj/item/caution(src)
new /obj/item/device/lightreplacer(src)
new /obj/item/weapon/storage/bag/trash(src)
new /obj/item/storage/bag/trash(src)
new /obj/item/clothing/shoes/galoshes(src)
new /obj/item/weapon/storage/belt/janitor(src)
new /obj/item/weapon/storage/box/lights/mixed(src)
new /obj/item/weapon/grenade/chem_grenade/cleaner(src)
new /obj/item/weapon/grenade/chem_grenade/cleaner(src)
new /obj/item/weapon/grenade/chem_grenade/cleaner(src)
new /obj/item/weapon/reagent_containers/spray/cleaner(src)
new /obj/item/weapon/reagent_containers/glass/rag(src)
new /obj/item/weapon/soap/nanotrasen(src)
new /obj/item/weapon/reagent_containers/glass/rag/advanced(src)
new /obj/item/storage/belt/janitor(src)
new /obj/item/storage/box/lights/mixed(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/grenade/chem_grenade/cleaner(src)
new /obj/item/reagent_containers/spray/cleaner(src)
new /obj/item/reagent_containers/glass/rag(src)
new /obj/item/soap/nanotrasen(src)
new /obj/item/reagent_containers/glass/rag/advanced(src)
/*
* Lawyer
code/game/objects/structures/crates_lockers/closets/l3closet.dm
+1 -1
View File
@@ -24,7 +24,7 @@
new /obj/item/clothing/suit/bio_suit/virology( src )
new /obj/item/clothing/head/bio_hood/virology( src )
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/tank/oxygen(src)
new /obj/item/tank/oxygen(src)
/obj/structure/closet/l3closet/security
code/game/objects/structures/crates_lockers/closets/malfunction.dm
+3 -3
View File
@@ -5,10 +5,10 @@
icon_opened = "syndicateopen"
/obj/structure/closet/malf/suits/fill()
new /obj/item/weapon/tank/jetpack/void(src)
new /obj/item/tank/jetpack/void(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/head/helmet/space/void(src)
new /obj/item/clothing/suit/space/void(src)
new /obj/item/weapon/crowbar(src)
new /obj/item/weapon/cell(src)
new /obj/item/crowbar(src)
new /obj/item/cell(src)
new /obj/item/device/multitool(src)
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+14 -14
View File
@@ -11,21 +11,21 @@
fill()
new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/reagent_containers/food/drinks/bottle/small/beer( src )
new /obj/item/reagent_containers/food/drinks/bottle/small/beer( src )
/obj/structure/closet/secure_closet/bar/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/secure_closet/bar/attackby(obj/item/W as obj, mob/user as mob)
if(opened)
if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
if(large)
MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
else
@@ -39,7 +39,7 @@
else
user.drop_item()
else if(!opened)
if(istype(W, /obj/item/weapon/melee/energy/blade))//Attempt to cut open locker if locked
if(istype(W, /obj/item/melee/energy/blade))//Attempt to cut open locker if locked
if(emag_act(INFINITY, user, "<span class='danger'>The locker has been sliced open by [user] with \an [W]</span>!", "<span class='danger'>You hear metal being sliced and sparks flying.</span>"))
spark(src, 5)
playsound(loc, 'sound/weapons/blade.ogg', 50, 1)
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+2 -2
View File
@@ -34,9 +34,9 @@
new /obj/item/clothing/shoes/brown(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/weapon/cartridge/quartermaster(src)
new /obj/item/cartridge/quartermaster(src)
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/weapon/tank/emergency_oxygen(src)
new /obj/item/tank/emergency_oxygen(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/head/soft(src)
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+26 -26
View File
@@ -10,9 +10,9 @@
/obj/structure/closet/secure_closet/engineering_chief/fill()
if(prob(50))
new /obj/item/weapon/storage/backpack/industrial(src)
new /obj/item/storage/backpack/industrial(src)
else
new /obj/item/weapon/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/satchel_eng(src)
if (prob(70))
new /obj/item/clothing/accessory/storage/brown_vest(src)
else
@@ -25,9 +25,9 @@
new /obj/item/clothing/gloves/yellow/specialu(src)
new /obj/item/clothing/gloves/yellow/specialt(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/weapon/cartridge/ce(src)
new /obj/item/cartridge/ce(src)
new /obj/item/device/radio/headset/heads/ce(src)
new /obj/item/weapon/storage/toolbox/mechanical(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson/aviator(src)
@@ -47,8 +47,8 @@
icon_off = "secureceoff"
/obj/structure/closet/secure_closet/engineering_chief2/fill()
new /obj/item/weapon/storage/backpack/industrial(src)
new /obj/item/weapon/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/industrial(src)
new /obj/item/storage/backpack/satchel_eng(src)
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/clothing/accessory/storage/webbing(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
@@ -71,12 +71,12 @@
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow/specialu(src)
new /obj/item/clothing/gloves/yellow/specialt(src)
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/storage/toolbox/electrical(src)
new /obj/item/weapon/module/power_control(src)
new /obj/item/weapon/module/power_control(src)
new /obj/item/weapon/module/power_control(src)
new /obj/item/storage/toolbox/electrical(src)
new /obj/item/storage/toolbox/electrical(src)
new /obj/item/storage/toolbox/electrical(src)
new /obj/item/module/power_control(src)
new /obj/item/module/power_control(src)
new /obj/item/module/power_control(src)
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
new /obj/item/device/multitool(src)
@@ -95,12 +95,12 @@
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/weapon/weldingtool/largetank(src)
new /obj/item/weapon/weldingtool/largetank(src)
new /obj/item/weapon/weldingtool/largetank(src)
new /obj/item/weapon/weldpack(src)
new /obj/item/weapon/weldpack(src)
new /obj/item/weapon/weldpack(src)
new /obj/item/weldingtool/largetank(src)
new /obj/item/weldingtool/largetank(src)
new /obj/item/weldingtool/largetank(src)
new /obj/item/weldpack(src)
new /obj/item/weldpack(src)
new /obj/item/weldpack(src)
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
@@ -114,20 +114,20 @@
/obj/structure/closet/secure_closet/engineering_personal/fill()
if(prob(50))
new /obj/item/weapon/storage/backpack/industrial(src)
new /obj/item/storage/backpack/industrial(src)
else
new /obj/item/weapon/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/satchel_eng(src)
if (prob(70))
new /obj/item/clothing/accessory/storage/brown_vest(src)
else
new /obj/item/clothing/accessory/storage/webbing(src)
new /obj/item/weapon/storage/toolbox/mechanical(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/device/radio/headset/headset_eng(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/glasses/meson/aviator(src)
new /obj/item/weapon/cartridge/engineering(src)
new /obj/item/cartridge/engineering(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/accessory/storage/overalls/engineer(src)
@@ -143,9 +143,9 @@
/obj/structure/closet/secure_closet/atmos_personal/fill()
if(prob(50))
new /obj/item/weapon/storage/backpack/industrial(src)
new /obj/item/storage/backpack/industrial(src)
else
new /obj/item/weapon/storage/backpack/satchel_eng(src)
new /obj/item/storage/backpack/satchel_eng(src)
if (prob(70))
new /obj/item/clothing/accessory/storage/brown_vest(src)
else
@@ -153,10 +153,10 @@
new /obj/item/clothing/suit/fire/atmos(src)
new /obj/item/clothing/head/hardhat/red/atmos(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/extinguisher(src)
new /obj/item/extinguisher(src)
new /obj/item/device/radio/headset/headset_eng(src)
new /obj/item/clothing/suit/storage/hazardvest/blue/atmos(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/weapon/cartridge/atmos(src)
new /obj/item/cartridge/atmos(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/accessory/storage/overalls/engineer(src)
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+7 -7
View File
@@ -18,9 +18,9 @@
fill()
for(var/i = 0, i < 2, i++)
new /obj/item/weapon/reagent_containers/food/condiment/flour(src)
new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
new /obj/item/weapon/reagent_containers/food/condiment/spacespice(src)
new /obj/item/reagent_containers/food/condiment/flour(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
new /obj/item/reagent_containers/food/condiment/spacespice(src)
/obj/structure/closet/secure_closet/freezer/kitchen/mining
req_access = list()
@@ -38,7 +38,7 @@
fill()
..()
for(var/i = 0, i < 8, i++)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
new /obj/item/reagent_containers/food/snacks/meat/monkey(src)
/obj/structure/closet/secure_closet/freezer/fridge
name = "refrigerator"
@@ -53,11 +53,11 @@
fill()
..()
for(var/i = 0, i < 5, i++)
new /obj/item/weapon/reagent_containers/food/drinks/milk(src)
new /obj/item/reagent_containers/food/drinks/milk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/weapon/reagent_containers/food/drinks/soymilk(src)
new /obj/item/reagent_containers/food/drinks/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/weapon/storage/fancy/egg_box(src)
new /obj/item/storage/fancy/egg_box(src)
/obj/structure/closet/secure_closet/freezer/money
code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+3 -3
View File
@@ -31,10 +31,10 @@
else
var/lazors = 0
var/shottas = 0
for (var/obj/item/weapon/gun/G in contents)
if (istype(G, /obj/item/weapon/gun/energy))
for (var/obj/item/gun/G in contents)
if (istype(G, /obj/item/gun/energy))
lazors++
if (istype(G, /obj/item/weapon/gun/projectile/))
if (istype(G, /obj/item/gun/projectile/))
shottas++
if (lazors || shottas)
for (var/i = 0 to 2)
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+13 -13
View File
@@ -15,17 +15,17 @@
new /obj/item/clothing/suit/apron(src)
if(2)
new /obj/item/clothing/suit/apron/overalls/blue(src)
new /obj/item/weapon/storage/bag/plants(src)
new /obj/item/storage/bag/plants(src)
new /obj/item/clothing/under/rank/hydroponics(src)
new /obj/item/device/analyzer/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/clothing/head/greenbandana(src)
new /obj/item/weapon/material/minihoe(src)
new /obj/item/weapon/material/hatchet(src)
new /obj/item/weapon/wirecutters/clippers(src)
new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
new /obj/item/weapon/storage/belt/hydro(src)
// new /obj/item/weapon/bee_net(src) //No more bees, March 2014
new /obj/item/material/minihoe(src)
new /obj/item/material/hatchet(src)
new /obj/item/wirecutters/clippers(src)
new /obj/item/reagent_containers/spray/plantbgone(src)
new /obj/item/storage/belt/hydro(src)
// new /obj/item/bee_net(src) //No more bees, March 2014
/obj/structure/closet/secure_closet/xenobotany
name = "xenobotanist's locker"
@@ -45,15 +45,15 @@
if(2)
new /obj/item/clothing/suit/apron/overalls/blue(src)
new /obj/item/clothing/under/rank/scientist/botany(src)
new /obj/item/weapon/storage/bag/plants(src)
new /obj/item/storage/bag/plants(src)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/device/analyzer/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_sci(src)
new /obj/item/clothing/head/greenbandana(src)
new /obj/item/weapon/material/minihoe(src)
new /obj/item/weapon/material/hatchet(src)
new /obj/item/weapon/wirecutters/clippers(src)
new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
new /obj/item/material/minihoe(src)
new /obj/item/material/hatchet(src)
new /obj/item/wirecutters/clippers(src)
new /obj/item/reagent_containers/spray/plantbgone(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/watertank(src)
new /obj/item/weapon/storage/belt/hydro(src)
new /obj/item/storage/belt/hydro(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+31 -31
View File
@@ -12,15 +12,15 @@
fill()
..()
new /obj/item/weapon/storage/box/syringes(src)
new /obj/item/weapon/reagent_containers/dropper(src)
new /obj/item/weapon/reagent_containers/dropper(src)
new /obj/item/weapon/reagent_containers/glass/beaker(src)
new /obj/item/weapon/reagent_containers/glass/beaker(src)
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
new /obj/item/storage/box/syringes(src)
new /obj/item/reagent_containers/dropper(src)
new /obj/item/reagent_containers/dropper(src)
new /obj/item/reagent_containers/glass/beaker(src)
new /obj/item/reagent_containers/glass/beaker(src)
new /obj/item/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/reagent_containers/glass/bottle/inaprovaline(src)
new /obj/item/reagent_containers/glass/bottle/antitoxin(src)
new /obj/item/reagent_containers/glass/bottle/antitoxin(src)
/obj/structure/closet/secure_closet/medical2
name = "anesthetics closet"
@@ -34,9 +34,9 @@
req_access = list(access_surgery)
fill()
new /obj/item/weapon/tank/anesthetic(src)
new /obj/item/weapon/tank/anesthetic(src)
new /obj/item/weapon/tank/anesthetic(src)
new /obj/item/tank/anesthetic(src)
new /obj/item/tank/anesthetic(src)
new /obj/item/tank/anesthetic(src)
new /obj/item/clothing/mask/breath/medical(src)
new /obj/item/clothing/mask/breath/medical(src)
new /obj/item/clothing/mask/breath/medical(src)
@@ -53,9 +53,9 @@
fill()
if(prob(50))
new /obj/item/weapon/storage/backpack/medic(src)
new /obj/item/storage/backpack/medic(src)
else
new /obj/item/weapon/storage/backpack/satchel_med(src)
new /obj/item/storage/backpack/satchel_med(src)
new /obj/item/clothing/head/nursehat (src)
switch(pick("blue", "green", "purple"))
if ("blue")
@@ -100,21 +100,21 @@
fill()
if(prob(50))
new /obj/item/weapon/storage/backpack/medic(src)
new /obj/item/storage/backpack/medic(src)
else
new /obj/item/weapon/storage/backpack/satchel_med(src)
new /obj/item/storage/backpack/satchel_med(src)
new /obj/item/clothing/suit/bio_suit/cmo(src)
new /obj/item/clothing/head/bio_hood/cmo(src)
new /obj/item/clothing/shoes/medical(src)
new /obj/item/clothing/under/rank/chief_medical_officer(src)
new /obj/item/weapon/cartridge/cmo(src)
new /obj/item/cartridge/cmo(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/device/radio/headset/heads/cmo(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/reagent_containers/hypospray/cmo(src)
new /obj/item/reagent_containers/hypospray/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
new /obj/item/weapon/storage/box/inhalers(src)
new /obj/item/storage/box/inhalers(src)
new /obj/item/clothing/glasses/hud/health/aviator(src)
/obj/structure/closet/secure_closet/CMO2
@@ -128,8 +128,8 @@
icon_off = "cmosecureoff"
fill()
new /obj/item/weapon/storage/backpack/medic(src)
new /obj/item/weapon/storage/backpack/satchel_med(src)
new /obj/item/storage/backpack/medic(src)
new /obj/item/storage/backpack/satchel_med(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/head/surgery/blue(src)
new /obj/item/clothing/under/rank/medical/green(src)
@@ -169,16 +169,16 @@
fill()
..()
new /obj/item/weapon/storage/box/pillbottles(src)
new /obj/item/weapon/storage/box/pillbottles(src)
new /obj/item/weapon/storage/box/spraybottles(src)
new /obj/item/weapon/storage/box/spraybottles(src)
new /obj/item/weapon/storage/box/inhalers(src)
new /obj/item/weapon/storage/box/inhalers_auto(src)
new /obj/item/weapon/storage/box/autoinjectors(src)
new /obj/item/weapon/storage/box/syringes(src)
new /obj/item/weapon/storage/box/beakers(src)
new /obj/item/weapon/storage/box/beakers(src)
new /obj/item/storage/box/pillbottles(src)
new /obj/item/storage/box/pillbottles(src)
new /obj/item/storage/box/spraybottles(src)
new /obj/item/storage/box/spraybottles(src)
new /obj/item/storage/box/inhalers(src)
new /obj/item/storage/box/inhalers_auto(src)
new /obj/item/storage/box/autoinjectors(src)
new /obj/item/storage/box/syringes(src)
new /obj/item/storage/box/beakers(src)
new /obj/item/storage/box/beakers(src)
/obj/structure/closet/secure_closet/medical_wall
name = "first aid closet"
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+7 -7
View File
@@ -6,9 +6,9 @@
/obj/structure/closet/secure_closet/personal/fill()
if(prob(50))
new /obj/item/weapon/storage/backpack(src)
new /obj/item/storage/backpack(src)
else
new /obj/item/weapon/storage/backpack/satchel_norm(src)
new /obj/item/storage/backpack/satchel_norm(src)
new /obj/item/device/radio/headset( src )
/obj/structure/closet/secure_closet/personal/patient
@@ -43,13 +43,13 @@
icon_state = icon_opened
/obj/structure/closet/secure_closet/personal/cabinet/fill()
new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
new /obj/item/storage/backpack/satchel/withwallet( src )
new /obj/item/device/radio/headset( src )
/obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob)
if (opened)
if (istype(W, /obj/item/weapon/grab))
if (istype(W, /obj/item/grab))
MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet
if(W)
user.drop_from_inventory(W,loc)
@@ -59,7 +59,7 @@
if(user.loc == src)
to_chat(user, "<span class='notice'>You can't reach the lock from inside.</span>")
return
var/obj/item/weapon/card/id/I = W.GetID()
var/obj/item/card/id/I = W.GetID()
if(broken)
to_chat(user, "<span class='warning'>It appears to be broken.</span>")
@@ -76,7 +76,7 @@
desc = "Owned by [I.registered_name]."
else
to_chat(user, "<span class='warning'>Access Denied</span>")
else if(istype(W, /obj/item/weapon/melee/energy/blade))
else if(istype(W, /obj/item/melee/energy/blade))
if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying."))
W:spark_system.queue()
playsound(loc, 'sound/weapons/blade.ogg', 50, 1)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+5 -5
View File
@@ -13,9 +13,9 @@
//new /obj/item/clothing/suit/labcoat/science(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/shoes/science(src)
// new /obj/item/weapon/cartridge/signal/science(src)
// new /obj/item/cartridge/signal/science(src)
new /obj/item/device/radio/headset/headset_sci(src)
new /obj/item/weapon/tank/air(src)
new /obj/item/tank/air(src)
new /obj/item/clothing/mask/gas(src)
@@ -36,15 +36,15 @@
new /obj/item/clothing/under/rank/research_director/rdalt(src)
new /obj/item/clothing/under/rank/research_director/dress_rd(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/weapon/cartridge/rd(src)
new /obj/item/cartridge/rd(src)
new /obj/item/clothing/shoes/science(src)
new /obj/item/clothing/shoes/leather(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/device/radio/headset/heads/rd(src)
new /obj/item/weapon/tank/air(src)
new /obj/item/tank/air(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/storage/box/firingpinsRD(src)
new /obj/item/storage/box/firingpinsRD(src)
new /obj/item/device/pin_extractor(src)
/obj/structure/closet/secure_closet/RD2
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+9 -9
View File
@@ -75,19 +75,19 @@
togglelock(user)
/obj/structure/closet/secure_closet/proc/CanChainsaw(var/obj/item/weapon/material/twohanded/chainsaw/ChainSawVar)
/obj/structure/closet/secure_closet/proc/CanChainsaw(var/obj/item/material/twohanded/chainsaw/ChainSawVar)
return (ChainSawVar.powered && !opened && !broken)
/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/secure_closet/attackby(obj/item/W as obj, mob/user as mob)
if(opened)
if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
if(large)
MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
else
to_chat(user, "<span class='notice'>The locker is too small to stuff [G.affecting] into!</span>")
if(W.iswelder())
var/obj/item/weapon/weldingtool/WT = W
var/obj/item/weldingtool/WT = W
if(WT.isOn())
user.visible_message(
"<span class='warning'>[user] begins cutting [src] apart.</span>",
@@ -149,8 +149,8 @@
wrenched = 1
anchored = 1
else if(!opened)
if(!broken && istype(W,/obj/item/weapon/material/twohanded/chainsaw))
var/obj/item/weapon/material/twohanded/chainsaw/ChainSawVar = W
if(!broken && istype(W,/obj/item/material/twohanded/chainsaw))
var/obj/item/material/twohanded/chainsaw/ChainSawVar = W
ChainSawVar.cutting = 1
user.visible_message(\
"<span class='danger'>[user.name] starts cutting the [src] with the [W]!</span>",\
@@ -166,13 +166,13 @@
emag_act(INFINITY, user, "<span class='danger'>The locker has been sliced open by [user] with \an [W]</span>!", "<span class='danger'>You hear metal being sliced and sparks flying.</span>")
spark(src, 5)
ChainSawVar.cutting = 0
else if(istype(W, /obj/item/weapon/melee/energy/blade))//Attempt to cut open locker if locked
else if(istype(W, /obj/item/melee/energy/blade))//Attempt to cut open locker if locked
if(emag_act(INFINITY, user, "<span class='danger'>The locker has been sliced open by [user] with \an [W]</span>!", "<span class='danger'>You hear metal being sliced and sparks flying.</span>"))
spark(src, 5)
playsound(loc, 'sound/weapons/blade.ogg', 50, 1)
playsound(loc, "sparks", 50, 1)
else if(W.iswelder())
var/obj/item/weapon/weldingtool/WT = W
var/obj/item/weldingtool/WT = W
if(WT.isOn())
user.visible_message(
"<span class='warning'>[user] begins welding [src] [welded ? "open" : "shut"].</span>",
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+60 -60
View File
@@ -11,9 +11,9 @@
fill()
//Appearance
if(prob(50))
new /obj/item/weapon/storage/backpack/captain(src)
new /obj/item/storage/backpack/captain(src)
else
new /obj/item/weapon/storage/backpack/satchel_cap(src)
new /obj/item/storage/backpack/satchel_cap(src)
new /obj/item/clothing/suit/captunic(src)
new /obj/item/clothing/suit/captunic/capjacket(src)
new /obj/item/clothing/head/caphat/cap(src)
@@ -27,10 +27,10 @@
new /obj/item/clothing/under/captainformal(src)
//Tools
new /obj/item/device/radio/headset/heads/captain(src)
new /obj/item/weapon/cartridge/captain(src)
new /obj/item/weapon/gun/energy/pistol(src)
new /obj/item/cartridge/captain(src)
new /obj/item/gun/energy/pistol(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/melee/telebaton(src)
new /obj/item/melee/telebaton(src)
/obj/structure/closet/secure_closet/captains2
name = "captain's attire"
@@ -43,8 +43,8 @@
icon_off = "capsecureoff"
fill()
new /obj/item/weapon/storage/backpack/captain(src)
new /obj/item/weapon/storage/backpack/satchel_cap(src)
new /obj/item/storage/backpack/captain(src)
new /obj/item/storage/backpack/satchel_cap(src)
new /obj/item/clothing/suit/captunic(src)
new /obj/item/clothing/suit/captunic/capjacket(src)
new /obj/item/clothing/head/caphat(src)
@@ -71,17 +71,17 @@
fill()
..()
//Supply
new /obj/item/weapon/storage/box/ids(src)
new /obj/item/weapon/storage/box/ids( src )
new /obj/item/storage/box/ids(src)
new /obj/item/storage/box/ids( src )
//Appearance
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/suit/storage/vest(src)
new /obj/item/clothing/head/helmet(src)
//Tools
new /obj/item/weapon/cartridge/hop(src)
new /obj/item/cartridge/hop(src)
new /obj/item/device/radio/headset/heads/hop(src)
new /obj/item/weapon/gun/energy/pistol(src)
new /obj/item/weapon/gun/projectile/sec/flash(src)
new /obj/item/gun/energy/pistol(src)
new /obj/item/gun/projectile/sec/flash(src)
new /obj/item/device/flash(src)
/obj/structure/closet/secure_closet/hop2
@@ -123,10 +123,10 @@
fill()
..()
//Supply
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/storage/box/flashbangs(src)
//Appearance
new /obj/item/weapon/storage/backpack/security(src)
new /obj/item/weapon/storage/backpack/satchel_sec(src)
new /obj/item/storage/backpack/security(src)
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/clothing/under/rank/head_of_security(src)
new /obj/item/clothing/under/rank/head_of_security/corp(src)
new /obj/item/clothing/suit/storage/toggle/armor/hos/jensen(src)
@@ -139,15 +139,15 @@
new /obj/item/clothing/shoes/black_boots(src)
new /obj/item/clothing/gloves/black_leather(src)
//Tools
new /obj/item/weapon/cartridge/hos(src)
new /obj/item/cartridge/hos(src)
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/weapon/storage/box/tranquilizer(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)
new /obj/item/weapon/shield/riot/tact(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/melee/telebaton(src)
new /obj/item/weapon/gun/energy/pistol(src)
new /obj/item/shield/riot/tact(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/melee/telebaton(src)
new /obj/item/gun/energy/pistol(src)
new /obj/item/taperoll/police(src)
new /obj/item/device/flash(src)
new /obj/item/device/holowarrant(src)
@@ -157,7 +157,7 @@
new /obj/item/clothing/accessory/holster/armpit(src)
new /obj/item/clothing/accessory/holster/hip(src)
new /obj/item/clothing/accessory/holster/thigh(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/storage/belt/security(src)
@@ -173,8 +173,8 @@
fill()
//Appearance
new /obj/item/weapon/storage/backpack/security(src)
new /obj/item/weapon/storage/backpack/satchel_sec(src)
new /obj/item/storage/backpack/security(src)
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/clothing/under/rank/head_of_security(src)
new /obj/item/clothing/under/rank/head_of_security/corp(src)
new /obj/item/clothing/suit/storage/vest/hos(src)
@@ -185,7 +185,7 @@
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/device/radio/headset/heads/hos(src)
//Belts
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/storage/belt/security(src)
new /obj/item/clothing/accessory/holster/armpit(src)
new /obj/item/clothing/accessory/holster/waist(src)
@@ -207,15 +207,15 @@
fill()
//Supply
new /obj/item/weapon/storage/box/holobadge(src)
new /obj/item/weapon/storage/box/ids(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/teargas(src)
new /obj/item/storage/box/holobadge(src)
new /obj/item/storage/box/ids(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/storage/box/teargas(src)
//Appearance
if(prob(50))
new /obj/item/weapon/storage/backpack/security(src)
new /obj/item/storage/backpack/security(src)
else
new /obj/item/weapon/storage/backpack/satchel_sec(src)
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/clothing/suit/storage/vest/warden(src)
new /obj/item/clothing/under/rank/warden(src)
new /obj/item/clothing/under/rank/warden/corp(src)
@@ -229,20 +229,20 @@
new /obj/item/clothing/shoes/black_boots(src)
new /obj/item/clothing/gloves/black_leather(src)
//Tools
new /obj/item/weapon/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/taperoll/police(src)
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/pistol(src)
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/gun/energy/pistol(src)
//Belts
if (prob(50))
new /obj/item/clothing/accessory/storage/black_vest(src)
else
new /obj/item/clothing/accessory/storage/pouches/black(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/storage/belt/security(src)
/obj/structure/closet/secure_closet/security_cadet
@@ -258,16 +258,16 @@
fill()
//Appearance
if(prob(50))
new /obj/item/weapon/storage/backpack/security(src)
new /obj/item/storage/backpack/security(src)
else
new /obj/item/weapon/storage/backpack/satchel_sec(src)
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/clothing/head/beret/sec/cadet(src)
new /obj/item/clothing/suit/storage/hazardvest/cadet(src)
new /obj/item/clothing/under/rank/cadet(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/taperoll/police(src)
new /obj/item/device/hailer(src)
new /obj/item/device/holowarrant(src)
@@ -277,7 +277,7 @@
new /obj/item/clothing/accessory/storage/black_vest(src)
else
new /obj/item/clothing/accessory/storage/pouches/black(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/storage/belt/security(src)
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
@@ -292,9 +292,9 @@
fill()
//Appearance
if(prob(50))
new /obj/item/weapon/storage/backpack/security(src)
new /obj/item/storage/backpack/security(src)
else
new /obj/item/weapon/storage/backpack/satchel_sec(src)
new /obj/item/storage/backpack/satchel_sec(src)
new /obj/item/clothing/head/soft/sec/corp(src)
new /obj/item/clothing/under/rank/security/corp(src)
new /obj/item/clothing/suit/storage/vest/officer(src)
@@ -305,22 +305,22 @@
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/ammo_magazine/c45m/rubber(src)
new /obj/random/handgun(src)
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/gun/energy/taser(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/taperoll/police(src)
new /obj/item/device/hailer(src)
new /obj/item/device/holowarrant(src)
new /obj/item/device/flashlight/flare(src)
new /obj/item/weapon/handcuffs(src)
new /obj/item/handcuffs(src)
//Belts
if (prob(50))
new /obj/item/clothing/accessory/storage/black_vest(src)
else
new /obj/item/clothing/accessory/storage/pouches/black(src)
new /obj/item/clothing/accessory/holster/hip(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/storage/belt/security(src)
/obj/structure/closet/secure_closet/security/cargo
@@ -374,7 +374,7 @@
new /obj/item/clothing/suit/storage/vest/detective(src)
new /obj/item/ammo_magazine/c38(src)
new /obj/item/ammo_magazine/c38(src)
new /obj/item/weapon/gun/projectile/revolver/detective(src)
new /obj/item/gun/projectile/revolver/detective(src)
new /obj/item/taperoll/police(src)
//Belts
new /obj/item/clothing/accessory/holster/armpit(src)
@@ -382,10 +382,10 @@
new /obj/item/clothing/accessory/holster/hip(src)
new /obj/item/clothing/accessory/holster/thigh(src)
/obj/structure/closet/secure_closet/detective/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/secure_closet/detective/attackby(obj/item/W as obj, mob/user as mob)
if(opened)
if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
if(large)
MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
else
@@ -396,7 +396,7 @@
return
user.drop_from_inventory(W,loc)
else if(!opened)
if(istype(W, /obj/item/weapon/melee/energy/blade))//Attempt to cut open locker if locked
if(istype(W, /obj/item/melee/energy/blade))//Attempt to cut open locker if locked
if(emag_act(INFINITY, user, "<span class='danger'>The locker has been sliced open by [user] with \an [W]</span>!", "<span class='danger'>You hear metal being sliced and sparks flying.</span>"))
spark(src, 5)
playsound(loc, 'sound/weapons/blade.ogg', 50, 1)
@@ -427,7 +427,7 @@
new /obj/item/clothing/shoes/laceup(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/weapon/storage/box/evidence(src)
new /obj/item/storage/box/evidence(src)
new /obj/item/device/flash(src)
new /obj/item/taperoll/police(src)
@@ -436,8 +436,8 @@
req_access = list(access_captain)
fill()
new /obj/item/weapon/reagent_containers/syringe/ld50_syringe/chloral(src)
new /obj/item/weapon/reagent_containers/syringe/ld50_syringe/chloral(src)
new /obj/item/reagent_containers/syringe/ld50_syringe/chloral(src)
new /obj/item/reagent_containers/syringe/ld50_syringe/chloral(src)
// These are special snowflakes that need to be in a global list.
@@ -470,11 +470,11 @@
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/suit/judgerobe (src)
//Tools
new /obj/item/weapon/paper/Court (src)
new /obj/item/weapon/paper/Court (src)
new /obj/item/weapon/paper/Court (src)
new /obj/item/weapon/pen (src)
new /obj/item/weapon/storage/briefcase(src)
new /obj/item/paper/Court (src)
new /obj/item/paper/Court (src)
new /obj/item/paper/Court (src)
new /obj/item/pen (src)
new /obj/item/storage/briefcase(src)
/obj/structure/closet/secure_closet/wall
name = "wall locker"
code/game/objects/structures/crates_lockers/closets/sol_gear.dm
+6 -6
View File
@@ -91,21 +91,21 @@
/obj/structure/closet/secure_closet/soll_officer/fill()
..()
if(prob(50))
new /obj/item/weapon/storage/backpack/captain(src)
new /obj/item/storage/backpack/captain(src)
else
new /obj/item/weapon/storage/backpack/satchel_cap(src)
new /obj/item/storage/backpack/satchel_cap(src)
new /obj/item/clothing/under/rank/dress/officer(src)
new /obj/item/clothing/head/dress/officer(src)
new /obj/item/clothing/suit/storage/vest(src)
new /obj/item/weapon/cartridge/captain(src)
new /obj/item/cartridge/captain(src)
new /obj/item/clothing/head/helmet(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/device/radio/headset/heads/captain(src)
new /obj/item/clothing/gloves/white(src)
new /obj/item/weapon/gun/energy/pistol(src)
new /obj/item/gun/energy/pistol(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/melee/telebaton(src)
new /obj/item/weapon/melee/ceremonial_sword(src)
new /obj/item/melee/telebaton(src)
new /obj/item/melee/ceremonial_sword(src)
new /obj/item/clothing/under/rank/fatigues(src)
new /obj/item/clothing/under/rank/service(src)
new /obj/item/clothing/shoes/jackboots(src)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+20 -20
View File
@@ -10,16 +10,16 @@
desc = "It's a storage unit for operative gear."
/obj/structure/closet/syndicate/personal/fill()
new /obj/item/weapon/tank/jetpack/oxygen(src)
new /obj/item/tank/jetpack/oxygen(src)
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/clothing/under/syndicate(src)
new /obj/item/clothing/head/helmet/space/void/merc(src)
new /obj/item/clothing/suit/space/void/merc(src)
new /obj/item/weapon/crowbar/red(src)
new /obj/item/weapon/cell/high(src)
new /obj/item/weapon/card/id/syndicate(src)
new /obj/item/crowbar/red(src)
new /obj/item/cell/high(src)
new /obj/item/card/id/syndicate(src)
new /obj/item/device/multitool(src)
new /obj/item/weapon/shield/energy(src)
new /obj/item/shield/energy(src)
new /obj/item/clothing/shoes/magboots(src)
@@ -27,7 +27,7 @@
desc = "It's a storage unit for voidsuits."
/obj/structure/closet/syndicate/suit/fill()
new /obj/item/weapon/tank/jetpack/oxygen(src)
new /obj/item/tank/jetpack/oxygen(src)
new /obj/item/clothing/shoes/magboots(src)
new /obj/item/clothing/suit/space/void/merc(src)
new /obj/item/clothing/mask/gas/syndicate(src)
@@ -45,18 +45,18 @@
new /obj/item/ammo_magazine/a10mm(src)
new /obj/item/ammo_magazine/a10mm(src)
new /obj/item/ammo_magazine/a10mm(src)
new /obj/item/weapon/storage/box/handcuffs(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/weapon/pinpointer/nukeop(src)
new /obj/item/storage/box/handcuffs(src)
new /obj/item/storage/box/flashbangs(src)
new /obj/item/gun/energy/gun(src)
new /obj/item/gun/energy/gun(src)
new /obj/item/gun/energy/gun(src)
new /obj/item/gun/energy/gun(src)
new /obj/item/gun/energy/gun(src)
new /obj/item/pinpointer/nukeop(src)
new /obj/item/pinpointer/nukeop(src)
new /obj/item/pinpointer/nukeop(src)
new /obj/item/pinpointer/nukeop(src)
new /obj/item/pinpointer/nukeop(src)
new /obj/item/device/pda/syndicate(src)
var/obj/item/device/radio/uplink/U = new(src)
U.hidden_uplink.uses = 40
@@ -75,7 +75,7 @@
//Sad trombone
if(pickednum == 1)
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src)
var/obj/item/paper/P = new /obj/item/paper(src)
P.name = "IOU"
P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
@@ -113,7 +113,7 @@
//Jetpack (You hit the jackpot!)
if(pickednum == 50)
new /obj/item/weapon/tank/jetpack/carbondioxide(src)
new /obj/item/tank/jetpack/carbondioxide(src)
return
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+25 -25
View File
@@ -22,8 +22,8 @@
/obj/structure/closet/emcloset/fill()
switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
if ("small")
new /obj/item/weapon/tank/emergency_oxygen(src)
new /obj/item/weapon/tank/emergency_oxygen(src)
new /obj/item/tank/emergency_oxygen(src)
new /obj/item/tank/emergency_oxygen(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/suit/space/emergency(src)
@@ -31,27 +31,27 @@
new /obj/item/device/oxycandle(src)
new /obj/item/airbubble(src)
if ("aid")
new /obj/item/weapon/tank/emergency_oxygen(src)
new /obj/item/weapon/storage/toolbox/emergency(src)
new /obj/item/tank/emergency_oxygen(src)
new /obj/item/storage/toolbox/emergency(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/storage/firstaid/o2(src)
new /obj/item/storage/firstaid/o2(src)
new /obj/item/clothing/suit/space/emergency(src)
new /obj/item/clothing/head/helmet/space/emergency(src)
new /obj/item/device/oxycandle(src)
new /obj/item/airbubble(src)
if ("tank")
new /obj/item/weapon/tank/emergency_oxygen/engi(src)
new /obj/item/tank/emergency_oxygen/engi(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/weapon/tank/emergency_oxygen/engi(src)
new /obj/item/tank/emergency_oxygen/engi(src)
new /obj/item/clothing/mask/gas/alt(src)
new /obj/item/device/oxycandle(src)
new /obj/item/device/oxycandle(src)
new /obj/item/airbubble(src)
if ("both")
new /obj/item/weapon/storage/toolbox/emergency(src)
new /obj/item/weapon/tank/emergency_oxygen/engi(src)
new /obj/item/storage/toolbox/emergency(src)
new /obj/item/tank/emergency_oxygen/engi(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/storage/firstaid/o2(src)
new /obj/item/storage/firstaid/o2(src)
new /obj/item/clothing/suit/space/emergency(src)
new /obj/item/clothing/suit/space/emergency(src)
new /obj/item/clothing/head/helmet/space/emergency(src)
@@ -64,7 +64,7 @@
/obj/structure/closet/emcloset/legacy/fill()
..()
new /obj/item/weapon/tank/oxygen(src)
new /obj/item/tank/oxygen(src)
new /obj/item/clothing/mask/gas(src)
/*
@@ -80,16 +80,16 @@
/obj/structure/closet/firecloset/fill()
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/weapon/tank/oxygen/red(src)
new /obj/item/weapon/extinguisher(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
/obj/structure/closet/firecloset/full/fill()
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/tank/oxygen/red(src)
new /obj/item/weapon/extinguisher(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
@@ -111,21 +111,21 @@
if(prob(70))
new /obj/item/device/flashlight(src)
if(prob(70))
new /obj/item/weapon/screwdriver(src)
new /obj/item/screwdriver(src)
if(prob(70))
new /obj/item/weapon/wrench(src)
new /obj/item/wrench(src)
if(prob(70))
new /obj/item/weapon/weldingtool(src)
new /obj/item/weldingtool(src)
if(prob(70))
new /obj/item/weapon/crowbar(src)
new /obj/item/crowbar(src)
if(prob(70))
new /obj/item/weapon/wirecutters(src)
new /obj/item/wirecutters(src)
if(prob(70))
new /obj/item/device/t_scanner(src)
if(prob(20))
new /obj/item/weapon/storage/belt/utility(src)
new /obj/item/storage/belt/utility(src)
if(prob(20))
new /obj/item/weapon/storage/belt/utility/alt(src)
new /obj/item/storage/belt/utility/alt(src)
if(prob(30))
new /obj/item/stack/cable_coil/random(src)
if(prob(30))
@@ -204,12 +204,12 @@
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/tank/oxygen/red(src)
new /obj/item/weapon/extinguisher(src)
new /obj/item/tank/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
if (prob(25))
new /obj/item/weapon/ladder_mobile(src)
new /obj/item/ladder_mobile(src)
/*
* First Aid
code/game/objects/structures/crates_lockers/closets/walllocker.dm
+2 -2
View File
@@ -16,7 +16,7 @@
/obj/structure/closet/walllocker/emerglocker
name = "emergency locker"
desc = "A wall mounted locker with emergency supplies."
var/list/spawnitems = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/breath)
var/list/spawnitems = list(/obj/item/tank/emergency_oxygen,/obj/item/clothing/mask/breath)
var/amount = 2 // spawns each items X times.
icon_state = "emerg"
@@ -24,7 +24,7 @@
attack_hand(user)
return
/obj/structure/closet/walllocker/emerglocker/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/walllocker/emerglocker/attackby(obj/item/W as obj, mob/user as mob)
return
/obj/structure/closet/walllocker/emerglocker/attack_hand(mob/user as mob)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+8 -8
View File
@@ -89,15 +89,15 @@
new /obj/item/clothing/head/chaplain_hood(src)
new /obj/item/clothing/suit/holidaypriest(src)
new /obj/item/clothing/under/wedding/bride_white(src)
new /obj/item/weapon/storage/backpack/cultpack (src)
new /obj/item/weapon/storage/fancy/candle_box(src)
new /obj/item/weapon/storage/fancy/candle_box(src)
new /obj/item/weapon/deck/tarot(src)
new /obj/item/storage/backpack/cultpack (src)
new /obj/item/storage/fancy/candle_box(src)
new /obj/item/storage/fancy/candle_box(src)
new /obj/item/deck/tarot(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/weapon/spirit_board(src)
new /obj/item/weapon/mesmetron(src)
new /obj/item/spirit_board(src)
new /obj/item/mesmetron(src)
new /obj/item/toy/plushie/therapy(src)
new /obj/item/weapon/book/manual/psych(src)
new /obj/item/book/manual/psych(src)
return
@@ -415,7 +415,7 @@
new /obj/item/clothing/head/helmet/tactical(src)
new /obj/item/clothing/mask/balaclava/tactical(src)
new /obj/item/clothing/glasses/sunglasses/sechud/tactical(src)
new /obj/item/weapon/storage/belt/security/tactical(src)
new /obj/item/storage/belt/security/tactical(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/gloves/black(src)
return
code/game/objects/structures/crates_lockers/crates.dm
+22 -22
View File
@@ -88,7 +88,7 @@
/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/crate/attackby(obj/item/W as obj, mob/user as mob)
if(opened)
return ..()
else if(istype(W, /obj/item/stack/packageWrap))
@@ -333,10 +333,10 @@
else
return toggle(user)
/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters)))
/obj/structure/closet/crate/secure/attackby(obj/item/W as obj, mob/user as mob)
if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/wirecutters)))
return ..()
if(istype(W, /obj/item/weapon/melee/energy/blade))
if(istype(W, /obj/item/melee/energy/blade))
emag_act(INFINITY, user)
if(!opened)
togglelock(user)
@@ -430,10 +430,10 @@
icon_closed = "crate"
/obj/structure/closet/crate/rfd/fill()
new /obj/item/weapon/rfd_ammo(src)
new /obj/item/weapon/rfd_ammo(src)
new /obj/item/weapon/rfd_ammo(src)
new /obj/item/weapon/rfd/construction(src)
new /obj/item/rfd_ammo(src)
new /obj/item/rfd_ammo(src)
new /obj/item/rfd_ammo(src)
new /obj/item/rfd/construction(src)
/obj/structure/closet/crate/solar
name = "solar pack crate"
@@ -460,9 +460,9 @@
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/weapon/circuitboard/solar_control(src)
new /obj/item/weapon/tracker_electronics(src)
new /obj/item/weapon/paper/solar(src)
new /obj/item/circuitboard/solar_control(src)
new /obj/item/tracker_electronics(src)
new /obj/item/paper/solar(src)
/obj/structure/closet/crate/freezer
name = "freezer"
@@ -492,8 +492,8 @@
/obj/structure/closet/crate/freezer/rations/fill()
for(var/i=1,i<=6,i++)
new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
new /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle(src)
new /obj/item/reagent_containers/food/snacks/liquidfood(src)
new /obj/item/reagent_containers/food/drinks/cans/waterbottle(src)
/obj/structure/closet/crate/bin
name = "large bin"
@@ -632,14 +632,14 @@
//This exists so the prespawned hydro crates spawn with their contents.
fill()
new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
new /obj/item/weapon/material/minihoe(src)
// new /obj/item/weapon/weedspray(src)
// new /obj/item/weapon/weedspray(src)
// new /obj/item/weapon/pestspray(src)
// new /obj/item/weapon/pestspray(src)
// new /obj/item/weapon/pestspray(src)
new /obj/item/reagent_containers/spray/plantbgone(src)
new /obj/item/reagent_containers/spray/plantbgone(src)
new /obj/item/material/minihoe(src)
// new /obj/item/weedspray(src)
// new /obj/item/weedspray(src)
// new /obj/item/pestspray(src)
// new /obj/item/pestspray(src)
// new /obj/item/pestspray(src)
@@ -705,7 +705,7 @@
/obj/structure/closet/crate/extinguisher_cartridges/fill()
for(var/a = 1 to 12)
new /obj/item/weapon/reagent_containers/extinguisher_refill(src)
new /obj/item/reagent_containers/extinguisher_refill(src)
/obj/structure/closet/crate/autakh
name = "aut'akh crate"
code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
+37 -37
View File
@@ -4,7 +4,7 @@
req_access = list(access_syndicate)
/obj/structure/closet/crate/secure/gear_loadout/frontier/fill()
new /obj/item/weapon/rig/gunslinger/equipped(src)
new /obj/item/rig/gunslinger/equipped(src)
new /obj/item/clothing/head/helmet/space/void/frontier(src)
new /obj/item/clothing/head/helmet/space/void/frontier(src)
new /obj/item/clothing/head/helmet/space/void/frontier(src)
@@ -15,13 +15,13 @@
new /obj/item/clothing/suit/space/void/frontier(src)
new /obj/item/clothing/suit/space/void/frontier(src)
new /obj/item/clothing/suit/space/void/frontier(src)
new /obj/item/weapon/gun/projectile/revolver/mateba(src)
new /obj/item/gun/projectile/revolver/mateba(src)
new /obj/item/ammo_magazine/a454(src)
new /obj/item/ammo_magazine/a454(src)
new /obj/item/weapon/gun/energy/retro(src)
new /obj/item/weapon/gun/energy/retro(src)
new /obj/item/weapon/gun/projectile/gauss(src)
new /obj/item/weapon/gun/projectile/gauss(src)
new /obj/item/gun/energy/retro(src)
new /obj/item/gun/energy/retro(src)
new /obj/item/gun/projectile/gauss(src)
new /obj/item/gun/projectile/gauss(src)
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss(src)
@@ -34,14 +34,14 @@
/obj/structure/closet/crate/secure/gear_loadout/frontier_single/fill()
new /obj/item/clothing/head/helmet/space/void/frontier(src)
new /obj/item/clothing/suit/space/void/frontier(src)
new /obj/item/weapon/gun/projectile/gauss(src)
new /obj/item/gun/projectile/gauss(src)
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss(src)
new /obj/item/ammo_magazine/gauss/emp(src)
/obj/structure/closet/crate/secure/gear_loadout/eridani/fill()
new /obj/item/weapon/rig/strike/equipped(src)
new /obj/item/rig/strike/equipped(src)
new /obj/item/clothing/head/helmet/space/void/cruiser(src)
new /obj/item/clothing/head/helmet/space/void/cruiser(src)
new /obj/item/clothing/head/helmet/space/void/cruiser(src)
@@ -52,21 +52,21 @@
new /obj/item/clothing/suit/space/void/cruiser(src)
new /obj/item/clothing/suit/space/void/cruiser(src)
new /obj/item/clothing/suit/space/void/cruiser(src)
new /obj/item/weapon/gun/energy/gun/nuclear(src)
new /obj/item/weapon/gun/energy/gun/nuclear(src)
new /obj/item/weapon/gun/energy/stunrevolver(src)
new /obj/item/weapon/gun/energy/stunrevolver(src)
new /obj/item/weapon/gun/energy/net(src)
new /obj/item/weapon/gun/energy/lawgiver(src)
new /obj/item/gun/energy/gun/nuclear(src)
new /obj/item/gun/energy/gun/nuclear(src)
new /obj/item/gun/energy/stunrevolver(src)
new /obj/item/gun/energy/stunrevolver(src)
new /obj/item/gun/energy/net(src)
new /obj/item/gun/energy/lawgiver(src)
/obj/structure/closet/crate/secure/gear_loadout/eridani_single/fill()
new /obj/item/clothing/head/helmet/space/void/cruiser(src)
new /obj/item/clothing/suit/space/void/cruiser(src)
new /obj/item/weapon/gun/energy/gun/nuclear(src)
new /obj/item/weapon/gun/energy/stunrevolver(src)
new /obj/item/gun/energy/gun/nuclear(src)
new /obj/item/gun/energy/stunrevolver(src)
/obj/structure/closet/crate/secure/gear_loadout/elyra/fill()
new /obj/item/weapon/rig/elyran/equipped(src)
new /obj/item/rig/elyran/equipped(src)
new /obj/item/clothing/head/helmet/space/void/valkyrie(src)
new /obj/item/clothing/head/helmet/space/void/valkyrie(src)
new /obj/item/clothing/head/helmet/space/void/valkyrie(src)
@@ -77,12 +77,12 @@
new /obj/item/clothing/suit/space/void/valkyrie(src)
new /obj/item/clothing/suit/space/void/valkyrie(src)
new /obj/item/clothing/suit/space/void/valkyrie(src)
new /obj/item/weapon/gun/projectile/plasma(src)
new /obj/item/weapon/gun/projectile/plasma(src)
new /obj/item/weapon/gun/projectile/plasma/bolter(src)
new /obj/item/weapon/gun/projectile/plasma/bolter(src)
new /obj/item/weapon/gun/projectile/plasma/bolter(src)
new /obj/item/weapon/gun/projectile/plasma/bolter(src)
new /obj/item/gun/projectile/plasma(src)
new /obj/item/gun/projectile/plasma(src)
new /obj/item/gun/projectile/plasma/bolter(src)
new /obj/item/gun/projectile/plasma/bolter(src)
new /obj/item/gun/projectile/plasma/bolter(src)
new /obj/item/gun/projectile/plasma/bolter(src)
new /obj/item/ammo_magazine/plasma(src)
new /obj/item/ammo_magazine/plasma(src)
new /obj/item/ammo_magazine/plasma(src)
@@ -95,18 +95,18 @@
new /obj/item/ammo_magazine/plasma/light(src)
new /obj/item/ammo_magazine/plasma/light(src)
new /obj/item/ammo_magazine/plasma/light(src)
new /obj/item/weapon/grenade/chem_grenade/large/phoroncleaner(src)
new /obj/item/weapon/grenade/chem_grenade/large/phoroncleaner(src)
new /obj/item/grenade/chem_grenade/large/phoroncleaner(src)
new /obj/item/grenade/chem_grenade/large/phoroncleaner(src)
/obj/structure/closet/crate/secure/gear_loadout/elyra_single/fill()
new /obj/item/clothing/head/helmet/space/void/valkyrie(src)
new /obj/item/clothing/suit/space/void/valkyrie(src)
new /obj/item/weapon/gun/projectile/plasma/bolter(src)
new /obj/item/gun/projectile/plasma/bolter(src)
new /obj/item/ammo_magazine/plasma/light(src)
new /obj/item/ammo_magazine/plasma/light(src)
new /obj/item/weapon/gun/projectile/pistol(src)
new /obj/item/gun/projectile/pistol(src)
new /obj/item/ammo_magazine/mc9mm(src)
new /obj/item/weapon/grenade/chem_grenade/large/phoroncleaner(src)
new /obj/item/grenade/chem_grenade/large/phoroncleaner(src)
/obj/structure/closet/crate/secure/gear_loadout/sol/fill()
new /obj/item/clothing/under/rank/fatigues/marine(src)
@@ -115,7 +115,7 @@
new /obj/item/clothing/under/rank/fatigues/marine(src)
new /obj/item/clothing/under/rank/fatigues/marine(src)
new /obj/item/clothing/under/rank/fatigues/marine(src)
new /obj/item/weapon/rig/military(src)
new /obj/item/rig/military(src)
new /obj/item/clothing/head/helmet/space/void/sol(src)
new /obj/item/clothing/head/helmet/space/void/sol(src)
new /obj/item/clothing/head/helmet/space/void/sol(src)
@@ -126,17 +126,17 @@
new /obj/item/clothing/suit/space/void/sol(src)
new /obj/item/clothing/suit/space/void/sol(src)
new /obj/item/clothing/suit/space/void/sol(src)
new /obj/item/weapon/gun/projectile/shotgun/pump/combat/sol(src)
new /obj/item/gun/projectile/shotgun/pump/combat/sol(src)
new /obj/item/ammo_magazine/assault_shotgun/shells(src)
new /obj/item/weapon/gun/projectile/automatic/rifle/sol(src)
new /obj/item/weapon/gun/projectile/automatic/rifle/sol(src)
new /obj/item/gun/projectile/automatic/rifle/sol(src)
new /obj/item/gun/projectile/automatic/rifle/sol(src)
new /obj/item/ammo_magazine/c762/sol(src)
new /obj/item/ammo_magazine/c762/sol(src)
new /obj/item/ammo_magazine/c762/sol(src)
new /obj/item/ammo_magazine/c762/sol(src)
new /obj/item/weapon/gun/projectile/pistol/sol(src)
new /obj/item/weapon/gun/projectile/pistol/sol(src)
new /obj/item/weapon/gun/projectile/pistol/sol(src)
new /obj/item/gun/projectile/pistol/sol(src)
new /obj/item/gun/projectile/pistol/sol(src)
new /obj/item/gun/projectile/pistol/sol(src)
new /obj/item/ammo_magazine/mc9mm(src)
new /obj/item/ammo_magazine/mc9mm(src)
new /obj/item/ammo_magazine/mc9mm(src)
@@ -148,8 +148,8 @@
new /obj/item/clothing/under/rank/fatigues/marine(src)
new /obj/item/clothing/head/helmet/space/void/sol(src)
new /obj/item/clothing/suit/space/void/sol(src)
new /obj/item/weapon/gun/projectile/automatic/rifle/sol(src)
new /obj/item/gun/projectile/automatic/rifle/sol(src)
new /obj/item/ammo_magazine/c762/sol(src)
new /obj/item/ammo_magazine/c762/sol(src)
new /obj/item/weapon/gun/projectile/pistol/sol(src)
new /obj/item/gun/projectile/pistol/sol(src)
new /obj/item/ammo_magazine/mc9mm(src)
code/game/objects/structures/crates_lockers/largecrate.dm
+2 -2
View File
@@ -9,7 +9,7 @@
to_chat(user, "<span class='notice'>You need a crowbar to pry this open!</span>")
return
/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/largecrate/attackby(obj/item/W as obj, mob/user as mob)
if(W.iscrowbar())
new /obj/item/stack/material/wood(src)
var/turf/T = get_turf(src)
@@ -33,7 +33,7 @@
desc = "It comes in a box for the fabricator's sake. Where does the wood come from? ... And why is it lighter?"
icon_state = "mulecrate"
/obj/structure/largecrate/hoverpod/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/largecrate/hoverpod/attackby(obj/item/W as obj, mob/user as mob)
if(W.iscrowbar())
var/obj/item/mecha_parts/mecha_equipment/ME
var/obj/mecha/working/hoverpod/H = new (loc)
code/game/objects/structures/displaycase.dm
+5 -5
View File
@@ -13,9 +13,9 @@
/obj/structure/displaycase/ex_act(severity)
switch(severity)
if (1)
new /obj/item/weapon/material/shard( src.loc )
new /obj/item/material/shard( src.loc )
if (occupied)
new /obj/item/weapon/gun/energy/captain( src.loc )
new /obj/item/gun/energy/captain( src.loc )
occupied = 0
qdel(src)
if (2)
@@ -39,7 +39,7 @@
if (!( src.destroyed ))
src.density = 0
src.destroyed = 1
new /obj/item/weapon/material/shard( src.loc )
new /obj/item/material/shard( src.loc )
playsound(src, "shatter", 70, 1)
update_icon()
else
@@ -54,7 +54,7 @@
return
/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/displaycase/attackby(obj/item/W as obj, mob/user as mob)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
src.health -= W.force
src.healthcheck()
@@ -63,7 +63,7 @@
/obj/structure/displaycase/attack_hand(mob/user as mob)
if (src.destroyed && src.occupied)
new /obj/item/weapon/gun/energy/captain( src.loc )
new /obj/item/gun/energy/captain( src.loc )
to_chat(user, "<span class='notice'>You deactivate the hover field built into the case.</span>")
src.occupied = 0
src.add_fingerprint(user)
code/game/objects/structures/door_assembly.dm
+7 -7
View File
@@ -8,7 +8,7 @@
var/state = 0
var/base_icon_state = ""
var/base_name = "Airlock"
var/obj/item/weapon/airlock_electronics/electronics = null
var/obj/item/airlock_electronics/electronics = null
var/airlock_type = "" //the type path of the airlock once completed
var/glass_type = "/glass"
var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead.
@@ -161,7 +161,7 @@
return
if(W.iswelder() && ( (istext(glass)) || (glass == 1) || (!anchored) ))
var/obj/item/weapon/weldingtool/WT = W
var/obj/item/weldingtool/WT = W
if (WT.remove_fuel(0, user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
if(istext(glass))
@@ -223,8 +223,8 @@
new/obj/item/stack/cable_coil(src.loc, 1)
src.state = 0
else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1)
var/obj/item/weapon/airlock_electronics/EL = W
else if(istype(W, /obj/item/airlock_electronics) && state == 1)
var/obj/item/airlock_electronics/EL = W
if(!EL.inuse)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
@@ -300,8 +300,8 @@
new path(src.loc, src)
qdel(src)
else if(istype(W, /obj/item/weapon/material/twohanded/chainsaw))
var/obj/item/weapon/material/twohanded/chainsaw/ChainSawVar = W
else if(istype(W, /obj/item/material/twohanded/chainsaw))
var/obj/item/material/twohanded/chainsaw/ChainSawVar = W
if(!ChainSawVar.wielded)
to_chat(user, "<span class='notice'>Cutting the airlock requires the strength of two hands.</span>")
else if(ChainSawVar.cutting)
@@ -330,7 +330,7 @@
..()
update_state()
/obj/structure/door_assembly/proc/CanChainsaw(var/obj/item/weapon/material/twohanded/chainsaw/ChainSawVar)
/obj/structure/door_assembly/proc/CanChainsaw(var/obj/item/material/twohanded/chainsaw/ChainSawVar)
return (ChainSawVar.powered)
/obj/structure/door_assembly/proc/update_state()
code/game/objects/structures/extinguisher.dm
+4 -4
View File
@@ -5,17 +5,17 @@
icon_state = "extinguisher_closed"
anchored = 1
density = 0
var/obj/item/weapon/extinguisher/has_extinguisher
var/obj/item/extinguisher/has_extinguisher
var/opened = 0
/obj/structure/extinguisher_cabinet/New()
..()
has_extinguisher = new/obj/item/weapon/extinguisher(src)
has_extinguisher = new/obj/item/extinguisher(src)
/obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user)
if(isrobot(user))
return
if(istype(O, /obj/item/weapon/extinguisher))
if(istype(O, /obj/item/extinguisher))
if(!has_extinguisher && opened)
user.remove_from_mob(O)
contents += O
@@ -65,7 +65,7 @@
icon_state = "extinguisher_closed"
return
if(has_extinguisher)
if(istype(has_extinguisher, /obj/item/weapon/extinguisher/mini))
if(istype(has_extinguisher, /obj/item/extinguisher/mini))
icon_state = "extinguisher_mini"
else
icon_state = "extinguisher_full"
code/game/objects/structures/fireaxe_cabinet.dm
+2 -2
View File
@@ -9,7 +9,7 @@
var/open
var/unlocked
var/shattered
var/obj/item/weapon/material/twohanded/fireaxe/fireaxe
var/obj/item/material/twohanded/fireaxe/fireaxe
/obj/structure/fireaxecabinet/attack_generic(var/mob/user, var/damage, var/attack_verb, var/wallbreaker)
user.do_attack_animation(src)
@@ -82,7 +82,7 @@
toggle_lock(user)
return
if(istype(O, /obj/item/weapon/material/twohanded/fireaxe))
if(istype(O, /obj/item/material/twohanded/fireaxe))
if(open)
if(fireaxe)
to_chat(user, "<span class='warning'>There is already \a [fireaxe] inside \the [src].</span>")
code/game/objects/structures/flora.dm
+2 -2
View File
@@ -209,8 +209,8 @@
..()
icon_state = "firstbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if(istype(W,/obj/item/weapon/material/scythe/sickle))
/obj/structure/flora/ausbushes/attackby(var/obj/item/W as obj, var/mob/user as mob)
if(istype(W,/obj/item/material/scythe/sickle))
if(prob(50))
new /obj/item/stack/material/wood(get_turf(src), 2)
if(prob(40))
code/game/objects/structures/girders.dm
+15 -15
View File
@@ -69,15 +69,15 @@
to_chat(user, "<span class='notice'>You secured the girder!</span>")
reset_girder()
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
else if(istype(W, /obj/item/gun/energy/plasmacutter))
to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
if(do_after(user,30/W.toolspeed))
if(!src) return
to_chat(user, "<span class='notice'>You slice apart the girder!</span>")
dismantle()
else if(istype(W, /obj/item/weapon/melee/energy))
var/obj/item/weapon/melee/energy/WT = W
else if(istype(W, /obj/item/melee/energy))
var/obj/item/melee/energy/WT = W
if(WT.active)
to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
if(do_after(user,30/W.toolspeed))
@@ -88,15 +88,15 @@
to_chat(user, "<span class='notice'>You need to activate the weapon to do that!</span>")
return
else if(istype(W, /obj/item/weapon/melee/energy/blade))
else if(istype(W, /obj/item/melee/energy/blade))
to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
if(do_after(user,30/W.toolspeed))
if(!src) return
to_chat(user, "<span class='notice'>You slice apart the girder!</span>")
dismantle()
else if(istype(W, /obj/item/weapon/melee/chainsword))
var/obj/item/weapon/melee/chainsword/WT = W
else if(istype(W, /obj/item/melee/chainsword))
var/obj/item/melee/chainsword/WT = W
if(WT.active)
to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
if(do_after(user,60/W.toolspeed))
@@ -107,11 +107,11 @@
to_chat(user, "<span class='notice'>You need to activate the weapon to do that!</span>")
return
else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill))
else if(istype(W, /obj/item/pickaxe/diamonddrill))
to_chat(user, "<span class='notice'>You drill through the girder!</span>")
dismantle()
else if(istype(W, /obj/item/weapon/melee/arm_blade/))
else if(istype(W, /obj/item/melee/arm_blade/))
to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
if(do_after(user,150))
if(!src)
@@ -286,19 +286,19 @@
to_chat(user, "<span class='notice'>You dissasembled the girder!</span>")
dismantle()
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
else if(istype(W, /obj/item/gun/energy/plasmacutter))
to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
if(do_after(user,30/W.toolspeed))
to_chat(user, "<span class='notice'>You slice apart the girder!</span>")
dismantle()
else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill))
else if(istype(W, /obj/item/pickaxe/diamonddrill))
to_chat(user, "<span class='notice'>You drill through the girder!</span>")
new /obj/effect/decal/remains/human(get_turf(src))
dismantle()
else if(istype(W, /obj/item/weapon/melee/energy))
var/obj/item/weapon/melee/energy/WT = W
else if(istype(W, /obj/item/melee/energy))
var/obj/item/melee/energy/WT = W
if(WT.active)
to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
if(do_after(user,30/W.toolspeed))
@@ -308,14 +308,14 @@
to_chat(user, "<span class='notice'>You need to activate the weapon to do that!</span>")
return
else if(istype(W, /obj/item/weapon/melee/energy/blade))
else if(istype(W, /obj/item/melee/energy/blade))
to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
if(do_after(user,30/W.toolspeed))
to_chat(user, "<span class='notice'>You slice apart the girder!</span>")
dismantle()
else if(istype(W, /obj/item/weapon/melee/chainsword))
var/obj/item/weapon/melee/chainsword/WT = W
else if(istype(W, /obj/item/melee/chainsword))
var/obj/item/melee/chainsword/WT = W
if(WT.active)
to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
if(do_after(user,60/W.toolspeed))
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -92,7 +92,7 @@
src.health -= damage*0.2
spawn(0) healthcheck() //spawn to make sure we return properly if the grille is deleted
/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/grille/attackby(obj/item/W as obj, mob/user as mob)
if(W.iswirecutter())
if(!shock(user, 100))
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
code/game/objects/structures/inflatable.dm
+3 -3
View File
@@ -83,8 +83,8 @@
add_fingerprint(user)
return
/obj/structure/inflatable/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(!istype(W) || istype(W, /obj/item/weapon/inflatable_dispenser)) return
/obj/structure/inflatable/attackby(obj/item/W as obj, mob/user as mob)
if(!istype(W) || istype(W, /obj/item/inflatable_dispenser)) return
if (can_puncture(W))
visible_message("<span class='danger'>[user] pierces [src] with [W]!</span>")
@@ -256,7 +256,7 @@
to_chat(user, "<span class='notice'>The inflatable door is too torn to be inflated!</span>")
add_fingerprint(user)
/obj/item/weapon/storage/briefcase/inflatable
/obj/item/storage/briefcase/inflatable
name = "inflatable barrier box"
desc = "Contains inflatable walls and doors."
icon_state = "inf_box"
code/game/objects/structures/janicart.dm
+13 -13
View File
@@ -13,9 +13,9 @@
flags = OPENCONTAINER
//copypaste sorry
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
var/obj/item/weapon/storage/bag/trash/mybag = null
var/obj/item/weapon/mop/mymop = null
var/obj/item/weapon/reagent_containers/spray/myspray = null
var/obj/item/storage/bag/trash/mybag = null
var/obj/item/mop/mymop = null
var/obj/item/reagent_containers/spray/myspray = null
var/obj/item/device/lightreplacer/myreplacer = null
var/obj/structure/mopbucket/mybucket = null
var/signs = 0 //maximum capacity hardcoded below
@@ -65,7 +65,7 @@
/obj/structure/janitorialcart/AltClick()
if(!usr || usr.stat || usr.lying || usr.restrained() || !Adjacent(usr)) return
var/obj/I = usr.get_active_hand()
if(istype(I, /obj/item/weapon/mop))
if(istype(I, /obj/item/mop))
if(!mymop)
usr.drop_from_inventory(I,src)
mymop = I
@@ -75,8 +75,8 @@
else
to_chat(usr, "<span class='notice'>The cart already has a mop attached</span>")
return
else if(istype(I, /obj/item/weapon/reagent_containers) && mybucket)
var/obj/item/weapon/reagent_containers/C = I
else if(istype(I, /obj/item/reagent_containers) && mybucket)
var/obj/item/reagent_containers/C = I
C.afterattack(mybucket, usr, 1)
else if(istype (I, /obj/item/device/lightreplacer))
var/obj/item/device/lightreplacer/LR = I
@@ -85,7 +85,7 @@
/obj/structure/janitorialcart/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/reagent_containers/glass/rag) || istype(I, /obj/item/weapon/soap))
if(istype(I, /obj/item/mop) || istype(I, /obj/item/reagent_containers/glass/rag) || istype(I, /obj/item/soap))
if (mybucket)
if(I.reagents.total_volume < I.reagents.maximum_volume)
if(mybucket.reagents.total_volume < 1)
@@ -102,7 +102,7 @@
to_chat(user, "<span class='notice'>There is no bucket mounted here to dip [I] into!</span>")
return 1
else if(istype(I, /obj/item/weapon/reagent_containers/spray) && !myspray)
else if(istype(I, /obj/item/reagent_containers/spray) && !myspray)
user.drop_from_inventory(I,src)
myspray = I
update_icon()
@@ -118,7 +118,7 @@
to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
return 1
else if(istype(I, /obj/item/weapon/storage/bag/trash) && !mybag)
else if(istype(I, /obj/item/storage/bag/trash) && !mybag)
user.drop_from_inventory(I,src)
mybag = I
I.forceMove(src)
@@ -127,7 +127,7 @@
to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
return 1
else if(istype(I, /obj/item/weapon/caution))
else if(istype(I, /obj/item/caution))
if(signs < 4)
user.drop_from_inventory(I,src)
signs++
@@ -143,7 +143,7 @@
//This return will prevent afterattack from executing if the object goes into the trashbag,
//This prevents dumb stuff like splashing the cart with the contents of a container, after putting said container into trash
else if (!has_items && (I.iswrench() || I.iswelder() || istype(I, /obj/item/weapon/gun/energy/plasmacutter)))
else if (!has_items && (I.iswrench() || I.iswelder() || istype(I, /obj/item/gun/energy/plasmacutter)))
dismantle(user)
return
..()
@@ -191,7 +191,7 @@
mybucket = null
if (signs)
for (var/obj/item/weapon/caution/Sign in src)
for (var/obj/item/caution/Sign in src)
if (prob(min((chance*2),100)))
signs--
Sign.forceMove(dropspot)
@@ -261,7 +261,7 @@
myreplacer = null
if("sign")
if(signs)
var/obj/item/weapon/caution/Sign = locate() in src
var/obj/item/caution/Sign = locate() in src
if(Sign)
user.put_in_hands(Sign)
to_chat(user, "<span class='notice'>You take \a [Sign] from [src].</span>")
code/game/objects/structures/kitchen_spike.dm
+3 -3
View File
@@ -12,8 +12,8 @@
var/meat_type
var/victim_name = "corpse"
/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
if(!istype(G, /obj/item/weapon/grab) || !G.affecting)
/obj/structure/kitchenspike/attackby(obj/item/grab/G as obj, mob/user as mob)
if(!istype(G, /obj/item/grab) || !G.affecting)
return
if(occupied)
to_chat(user, "<span class = 'danger'>The spike already has something on it, finish collecting its meat first!</span>")
@@ -37,7 +37,7 @@
meat_type = H.species.meat_type
icon_state = "spikebloody"
else if(istype(victim, /mob/living/carbon/alien))
meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
icon_state = "spikebloodygreen"
else
return 0
code/game/objects/structures/lattice.dm
+2 -2
View File
@@ -44,7 +44,7 @@
T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead
return
if (C.iswelder())
var/obj/item/weapon/weldingtool/WT = C
var/obj/item/weldingtool/WT = C
if(WT.remove_fuel(0, user))
to_chat(user, "<span class='notice'>Slicing lattice joints ...</span>")
new /obj/item/stack/rods(src.loc)
@@ -75,7 +75,7 @@
/obj/structure/lattice/catwalk/attackby(obj/item/C, mob/user)
if (C.iswelder())
var/obj/item/weapon/weldingtool/WT = C
var/obj/item/weldingtool/WT = C
if (do_after(user, 5/C.toolspeed, act_target = src) && WT.remove_fuel(1, user))
to_chat(user, "<span class='notice'>You slice apart [src].</span>")
playsound(src, 'sound/items/Welder.ogg', 50, 1)
code/game/objects/structures/mirror.dm
+3 -3
View File
@@ -102,14 +102,14 @@
qdel(user)
..()
/obj/item/weapon/mirror
/obj/item/mirror
name = "mirror"
desc = "A SalonPro Nano-Mirror(TM) brand mirror! Now a portable version."
icon = 'icons/obj/cosmetics.dmi'
icon_state = "mirror"
var/list/ui_users = list()
/obj/item/weapon/mirror/attack_self(mob/user as mob)
/obj/item/mirror/attack_self(mob/user as mob)
if(user.mind && user.mind.vampire && (!(user.mind.vampire.status & VAMP_ISTHRALL)))
to_chat(user, "<span class='notice'>Your reflection appears distorted on the surface of \the [src].</span>")
@@ -123,7 +123,7 @@
ui_users[user] = AC
AC.ui_interact(user)
/obj/item/weapon/mirror/Destroy()
/obj/item/mirror/Destroy()
for(var/user in ui_users)
var/datum/nano_module/appearance_changer/AC = ui_users[user]
qdel(AC)
code/game/objects/structures/mop_bucket.dm
+1 -1
View File
@@ -23,7 +23,7 @@
to_chat(user, "Contains [reagents.total_volume] unit\s of water.")
/obj/structure/mopbucket/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/weapon/mop))
if(istype(I, /obj/item/mop))
if(reagents.total_volume < 1)
to_chat(user, "<span class='warning'>\The [src] is out of water!</span>")
else
code/game/objects/structures/morgue.dm
+1 -1
View File
@@ -320,7 +320,7 @@
return
else
if(!isemptylist(src.search_contents_for(/obj/item/weapon/disk/nuclear)))
if(!isemptylist(src.search_contents_for(/obj/item/disk/nuclear)))
to_chat(usr, "You get the feeling that you shouldn't cremate one of the items in the cremator.")
return
code/game/objects/structures/noticeboard.dm
+5 -5
View File
@@ -11,14 +11,14 @@
. = ..()
for(var/obj/item/I in loc)
if(notices > 4) break
if(istype(I, /obj/item/weapon/paper))
if(istype(I, /obj/item/paper))
I.forceMove(src)
notices++
icon_state = "nboard0[notices]"
//attaching papers!!
/obj/structure/noticeboard/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/weapon/paper))
/obj/structure/noticeboard/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/paper))
if(notices < 5)
O.add_fingerprint(user)
add_fingerprint(user)
@@ -39,7 +39,7 @@
user = usr
if(user.Adjacent(src))
var/dat = "<B>Noticeboard</B><BR>"
for(var/obj/item/weapon/paper/P in src)
for(var/obj/item/paper/P in src)
dat += "<A href='?src=\ref[src];read=\ref[P]'>[P.name]</A> <A href='?src=\ref[src];write=\ref[P]'>Write</A> <A href='?src=\ref[src];remove=\ref[P]'>Remove</A><BR>"
user << browse("<HEAD><TITLE>Notices</TITLE></HEAD>[dat]","window=noticeboard")
onclose(user, "noticeboard")
@@ -75,7 +75,7 @@
return
add_fingerprint(usr)
if(href_list["read"])
var/obj/item/weapon/paper/P = locate(href_list["read"])
var/obj/item/paper/P = locate(href_list["read"])
if((P && P.loc == src))
usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY><TT>[P.info]</TT></BODY></HTML>", "window=[P.name]")
onclose(usr, "[P.name]")
code/game/objects/structures/sarcophagus.dm
+1 -1
View File
@@ -59,7 +59,7 @@
if("remains")
new /obj/effect/decal/remains/xeno (get_turf(src))
if("xenoarch")
new /obj/item/weapon/archaeological_find (get_turf(src))
new /obj/item/archaeological_find (get_turf(src))
if("highvalue")
new /obj/random/highvalue (get_turf(src))
if("supermatter")
code/game/objects/structures/shotgun_rack.dm
+7 -7
View File
@@ -6,12 +6,12 @@
anchored = 1
density = 0
var/obj/item/weapon/gun/projectile/shotgun/rack_shotgun
var/obj/item/gun/projectile/shotgun/rack_shotgun
/obj/structure/shotgun_rack/attackby(obj/item/O, mob/user)
if(isrobot(user))
return
if(istype(O, /obj/item/weapon/gun/projectile/shotgun) && O.w_class != 3) //w_class check is to stop people from placing a sawn off shotgun here
if(istype(O, /obj/item/gun/projectile/shotgun) && O.w_class != 3) //w_class check is to stop people from placing a sawn off shotgun here
if(!rack_shotgun)
user.unEquip(O)
O.forceMove(src)
@@ -44,14 +44,14 @@
/obj/structure/shotgun_rack/double/Initialize()
. = ..()
rack_shotgun = new/obj/item/weapon/gun/projectile/shotgun/doublebarrel(src)
rack_shotgun = new/obj/item/gun/projectile/shotgun/doublebarrel(src)
/obj/structure/shotgun_rack/double_pellet
icon_state = "shotgun_rack_dshotgun"
/obj/structure/shotgun_rack/double_pellet/Initialize()
. = ..()
rack_shotgun = new/obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet(src)
rack_shotgun = new/obj/item/gun/projectile/shotgun/doublebarrel/pellet(src)
/obj/structure/shotgun_rack/pump
@@ -59,18 +59,18 @@
/obj/structure/shotgun_rack/pump/Initialize()
. = ..()
rack_shotgun = new/obj/item/weapon/gun/projectile/shotgun/pump(src)
rack_shotgun = new/obj/item/gun/projectile/shotgun/pump(src)
/obj/structure/shotgun_rack/combat
icon_state = "shotgun_rack_cshotgun"
/obj/structure/shotgun_rack/combat/Initialize()
. = ..()
rack_shotgun = new/obj/item/weapon/gun/projectile/shotgun/pump/combat(src)
rack_shotgun = new/obj/item/gun/projectile/shotgun/pump/combat(src)
/obj/structure/shotgun_rack/improvised
icon_state = "shotgun_rack_ishotgun"
/obj/structure/shotgun_rack/improvised/Initialize()
. = ..()
rack_shotgun = new/obj/item/weapon/gun/projectile/shotgun/improvised(src)
rack_shotgun = new/obj/item/gun/projectile/shotgun/improvised(src)
code/game/objects/structures/signs.dm
+32 -32
View File
@@ -299,12 +299,12 @@
/obj/structure/sign/flag/sol/right
icon_state = "solgov_r"
/obj/item/weapon/flag/sol
/obj/item/flag/sol
name = "Sol Alliance flag"
desc = "The bright blue flag of the Alliance of Sovereign Solarian Nations."
flag_path = "solgov"
/obj/item/weapon/flag/sol/l
/obj/item/flag/sol/l
flag_size = 1
/obj/structure/sign/flag/dominia
@@ -318,12 +318,12 @@
/obj/structure/sign/flag/dominia/right
icon_state = "dominia_r"
/obj/item/weapon/flag/dominia
/obj/item/flag/dominia
name = "Dominian Empire flag"
desc = "The Imperial Standard of Emperor Boleslaw Keeser of Dominia."
flag_path = "dominia"
/obj/item/weapon/flag/dominia/l
/obj/item/flag/dominia/l
flag_size = 1
/obj/structure/sign/flag/elyra
@@ -337,12 +337,12 @@
/obj/structure/sign/flag/elyra/right
icon_state = "elyra_r"
/obj/item/weapon/flag/elyra
/obj/item/flag/elyra
name = "Elyran flag"
desc = "The hopeful colors of the Serene Republic of Elyra."
flag_path = "elyra"
/obj/item/weapon/flag/elyra/l
/obj/item/flag/elyra/l
flag_size = 1
/obj/structure/sign/flag/hegemony
@@ -356,12 +356,12 @@
/obj/structure/sign/flag/hegemony/right
icon_state = "izweski_r"
/obj/item/weapon/flag/hegemony
/obj/item/flag/hegemony
name = "Hegemony flag"
desc = "The feudal standard of the Izweski Hegemony."
flag_path = "izweski"
/obj/item/weapon/flag/hegemony/l
/obj/item/flag/hegemony/l
flag_size = 1
/obj/structure/sign/flag/jargon
@@ -375,12 +375,12 @@
/obj/structure/sign/flag/jargon/right
icon_state = "jargon_r"
/obj/item/weapon/flag/jargon
/obj/item/flag/jargon
name = "Jargon Federation flag"
desc = "The insignia of the Jargon Federation"
flag_path = "jargon"
/obj/item/weapon/flag/jargon/l
/obj/item/flag/jargon/l
flag_size = 1
/obj/structure/sign/flag/nanotrasen
@@ -394,12 +394,12 @@
/obj/structure/sign/flag/nanotrasen/right
icon_state = "nanotrasen_r"
/obj/item/weapon/flag/nanotrasen
/obj/item/flag/nanotrasen
name = "NanoTrasen Corporation flag"
desc = "The logo of NanoTrasen on a flag."
flag_path = "nanotrasen"
/obj/item/weapon/flag/nanotrasen/l
/obj/item/flag/nanotrasen/l
flag_size = 1
/obj/structure/sign/flag/eridani
@@ -413,12 +413,12 @@
/obj/structure/sign/flag/eridani/right
icon_state = "eridani_r"
/obj/item/weapon/flag/eridani
/obj/item/flag/eridani
name = "Eridani Corporate Federation flag"
desc = "The logo of the Eridani Corporate Federation on a flag."
flag_path = "eridani"
/obj/item/weapon/flag/eridani/l
/obj/item/flag/eridani/l
flag_size = 1
/obj/structure/sign/flag/vaurca
@@ -432,12 +432,12 @@
/obj/structure/sign/flag/vaurca/right
icon_state = "sedantis_r"
/obj/item/weapon/flag/vaurca
/obj/item/flag/vaurca
name = "Sedantis flag"
desc = "The emblem of Sedantis on a flag, emblematic of Vaurca longing."
flag_path = "sedantis"
/obj/item/weapon/flag/vaurca/l
/obj/item/flag/vaurca/l
flag_size = 1
/obj/structure/sign/flag/america
@@ -451,15 +451,15 @@
/obj/structure/sign/flag/america/right
icon_state = "oldglory_r"
/obj/item/weapon/flag/america
/obj/item/flag/america
name = "Old World flag"
desc = "The banner of an ancient nation, its glory old."
flag_path = "oldglory"
/obj/item/weapon/flag/america/l
/obj/item/flag/america/l
flag_size = 1
/obj/item/weapon/flag/dpra
/obj/item/flag/dpra
name = "Democratic People's Republic of Adhomai flag"
desc = "The black flag of the Democratic People's Republic of Adhomai."
flag_path = "dpra"
@@ -468,7 +468,7 @@
to \"free Tajara from the new shackles imposed upon them by the corporate overlords and return Adhomai to a free, prosperous planet like our ancestors dreamed of.\" They named the \
nation they were fighting for the Democratic People's Republic of Adhomai."
/obj/item/weapon/flag/dpra/l
/obj/item/flag/dpra/l
flag_size = 1
/obj/structure/sign/flag/dpra
@@ -486,7 +486,7 @@
/obj/structure/sign/flag/dpra/right
icon_state = "dpra_r"
/obj/item/weapon/flag/pra
/obj/item/flag/pra
name = "People's Republic of Adhomai flag"
desc = "The tajaran flag of the People's Republic of Adhomai."
flag_path = "pra"
@@ -496,7 +496,7 @@
revolution to the masses. With land reform, enfranchisement of women and peasantry, literacy initiatives, and the collectivization of farms and the means of production, the PRA is \
struggling to hold true to its radical ideals while an entrenched upper party stubbornly tries to hold onto power."
/obj/item/weapon/flag/pra/l
/obj/item/flag/pra/l
flag_size = 1
/obj/structure/sign/flag/pra
@@ -515,7 +515,7 @@
/obj/structure/sign/flag/pra/right
icon_state = "pra_r"
/obj/item/weapon/flag/nka
/obj/item/flag/nka
name = "New Kingdom of Adhomai flag"
desc = "The blue flag of the New Kingdom of Adhomai."
flag_path = "nka"
@@ -525,7 +525,7 @@
slaughters. The New Kingdom puts forth the ideology that Republicanism is bloodshed. The only way to return Adhomai to peace and prosperity is to learn from the mistakes of the \
ancient nobles and Republicans, and create a new noble dynasty."
/obj/item/weapon/flag/nka/l
/obj/item/flag/nka/l
flag_size = 1
/obj/structure/sign/flag/nka
@@ -544,12 +544,12 @@
/obj/structure/sign/flag/nka/right
icon_state = "nka_r"
/obj/item/weapon/flag/heph
/obj/item/flag/heph
name = "Hephaestus Industries flag"
desc = "The logo of Hephaestus Industries on a flag."
flag_path = "heph"
/obj/item/weapon/flag/heph/l
/obj/item/flag/heph/l
flag_size = 1
/obj/structure/sign/flag/heph
@@ -563,12 +563,12 @@
/obj/structure/sign/flag/heph/right
icon_state = "heph_r"
/obj/item/weapon/flag/zenghu
/obj/item/flag/zenghu
name = "Zeng-Hu Pharmaceuticals flag"
desc = "The logo of Zeng-Hu Pharmaceuticals on a flag."
flag_path = "zenghu"
/obj/item/weapon/flag/zenghu/l
/obj/item/flag/zenghu/l
flag_size = 1
/obj/structure/sign/flag/zenghu
@@ -582,7 +582,7 @@
/obj/structure/sign/flag/zenghu/right
icon_state = "zenghu_r"
/obj/item/weapon/flag
/obj/item/flag
name = "boxed flag"
desc = "A flag neatly folded into a wooden container."
icon = 'icons/obj/decals.dmi'
@@ -590,7 +590,7 @@
var/flag_path
var/flag_size = 0
/obj/item/weapon/flag/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
/obj/item/flag/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
if (!adjacent)
return
@@ -660,10 +660,10 @@
desc = "You can't make out anything from the flag's original print. It's ruined."
add_fingerprint(user)
/obj/structure/sign/flag/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/sign/flag/attackby(obj/item/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/weapon/flame/lighter))
if(istype(W, /obj/item/flame/lighter))
visible_message("<span class='warning'>\The [user] starts to burn \the [src] down!</span>")
code/game/objects/structures/simple_doors.dm
+7 -7
View File
@@ -148,9 +148,9 @@
else
icon_state = material.door_icon_base
/obj/structure/simple_door/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/key) && lock)
var/obj/item/weapon/key/K = W
/obj/structure/simple_door/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/key) && lock)
var/obj/item/key/K = W
if(!lock.toggle(W))
to_chat(user, "<span class='warning'>\The [K] does not fit in the lock!</span>")
return
@@ -158,16 +158,16 @@
if(lock && lock.pick_lock(W,user))
return
if(istype(W,/obj/item/weapon/material/lock_construct))
if(istype(W,/obj/item/material/lock_construct))
if(lock)
to_chat(user, "<span class='warning'>\The [src] already has a lock.</span>")
else
var/obj/item/weapon/material/lock_construct/L = W
var/obj/item/material/lock_construct/L = W
lock = L.create_lock(src,user)
return
else if(istype(W,/obj/item/weapon))
var/obj/item/weapon/I = W
else if(istype(W,/obj/item))
var/obj/item/I = W
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(I.damtype == BRUTE || I.damtype == BURN)
if(I.force < 10)
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+1 -1
View File
@@ -39,7 +39,7 @@
src.add_fingerprint(user)
return
/obj/structure/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/bed/nest/attackby(obj/item/W as obj, mob/user as mob)
var/aforce = W.force
health = max(0, health - aforce)
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+5 -5
View File
@@ -92,7 +92,7 @@
qdel(src)
return
/obj/structure/bed/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/bed/attackby(obj/item/W as obj, mob/user as mob)
if(W.iswrench())
if(can_dismantle)
playsound(src.loc, W.usesound, 50, 1)
@@ -132,8 +132,8 @@
playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
remove_padding()
else if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
else if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
var/mob/living/affecting = G.affecting
user.visible_message("<span class='notice'>[user] attempts to buckle [affecting] into \the [src]!</span>")
if(do_after(user, 20))
@@ -194,7 +194,7 @@
/obj/structure/bed/roller/update_icon()
return // Doesn't care about material or anything else.
/obj/structure/bed/roller/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/bed/roller/attackby(obj/item/W as obj, mob/user as mob)
if(W.iswrench() || istype(W,/obj/item/stack) || W.iswirecutter())
return
else if(istype(W,/obj/item/roller_holder))
@@ -221,7 +221,7 @@
R.add_fingerprint(user)
qdel(src)
/obj/item/roller/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/roller/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/roller_holder))
var/obj/item/roller_holder/RH = W
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+3 -3
View File
@@ -8,7 +8,7 @@
buckle_lying = 0 //force people to sit up in chairs when buckled
var/propelled = 0 // Check for fire-extinguisher-driven chairs
/obj/structure/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/bed/chair/attackby(obj/item/W as obj, mob/user as mob)
..()
if(!padding_material && istype(W, /obj/item/assembly/shock_kit))
var/obj/item/assembly/shock_kit/SK = W
@@ -130,7 +130,7 @@
/obj/structure/bed/chair/office/update_icon()
return
/obj/structure/bed/chair/office/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/bed/chair/office/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/stack) || W.iswirecutter())
return
..()
@@ -204,7 +204,7 @@
/obj/structure/bed/chair/wood/update_icon()
return
/obj/structure/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/bed/chair/wood/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/stack) || W.iswirecutter())
return
..()
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+11 -11
View File
@@ -1,6 +1,6 @@
//Todo: add leather and cloth for arbitrary coloured stools.
/obj/item/weapon/stool
/obj/item/stool
name = "stool"
desc = "Apply butt."
icon = 'icons/obj/furniture.dmi'
@@ -18,10 +18,10 @@
var/material/material
var/material/padding_material
/obj/item/weapon/stool/padded
/obj/item/stool/padded
icon_state = "stool_padded_preview" //set for the map
/obj/item/weapon/stool/New(var/newloc, var/new_material, var/new_padding_material)
/obj/item/stool/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc)
if(!new_material)
new_material = DEFAULT_WALL_MATERIAL
@@ -34,10 +34,10 @@
force = round(material.get_blunt_damage()*0.4)
update_icon()
/obj/item/weapon/stool/padded/New(var/newloc, var/new_material)
/obj/item/stool/padded/New(var/newloc, var/new_material)
..(newloc, "steel", "carpet")
/obj/item/weapon/stool/update_icon()
/obj/item/stool/update_icon()
// Prep icon.
icon_state = ""
cut_overlays()
@@ -65,17 +65,17 @@
name = "[material.display_name] [initial(name)]"
desc = "A stool. Apply butt with care. It's made of [material.use_name]."
/obj/item/weapon/stool/proc/add_padding(var/padding_type)
/obj/item/stool/proc/add_padding(var/padding_type)
padding_material = get_material_by_name(padding_type)
update_icon()
/obj/item/weapon/stool/proc/remove_padding()
/obj/item/stool/proc/remove_padding()
if(padding_material)
padding_material.place_sheet(get_turf(src))
padding_material = null
update_icon()
/obj/item/weapon/stool/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
/obj/item/stool/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
if (prob(5))
user.visible_message("<span class='danger'>[user] breaks [src] over [target]'s back!</span>")
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
@@ -92,7 +92,7 @@
..()
/obj/item/weapon/stool/ex_act(severity)
/obj/item/stool/ex_act(severity)
switch(severity)
if(1.0)
qdel(src)
@@ -106,14 +106,14 @@
qdel(src)
return
/obj/item/weapon/stool/proc/dismantle()
/obj/item/stool/proc/dismantle()
if(material)
material.place_sheet(get_turf(src))
if(padding_material)
padding_material.place_sheet(get_turf(src))
qdel(src)
/obj/item/weapon/stool/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/stool/attackby(obj/item/W as obj, mob/user as mob)
if(W.iswrench())
playsound(src.loc, W.usesound, 50, 1)
dismantle()
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+1 -1
View File
@@ -18,7 +18,7 @@
if(buckled_mob)
buckled_mob.set_dir(dir)
/obj/structure/bed/chair/wheelchair/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/bed/chair/wheelchair/attackby(obj/item/W as obj, mob/user as mob)
if(W.iswrench() || istype(W,/obj/item/stack) || W.iswirecutter())
return
..()
code/game/objects/structures/tank_dispenser.dm
+6 -6
View File
@@ -50,7 +50,7 @@
/obj/structure/dispenser/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/weapon/tank/oxygen) || istype(I, /obj/item/weapon/tank/air) || istype(I, /obj/item/weapon/tank/anesthetic))
if(istype(I, /obj/item/tank/oxygen) || istype(I, /obj/item/tank/air) || istype(I, /obj/item/tank/anesthetic))
if(oxygentanks < 10)
user.drop_from_inventory(I,src)
oxytanks.Add(I)
@@ -62,7 +62,7 @@
to_chat(user, "<span class='notice'>[src] is full.</span>")
updateUsrDialog()
return
if(istype(I, /obj/item/weapon/tank/phoron))
if(istype(I, /obj/item/tank/phoron))
if(phorontanks < 10)
user.drop_from_inventory(I,src)
platanks.Add(I)
@@ -90,24 +90,24 @@
usr.set_machine(src)
if(href_list["oxygen"])
if(oxygentanks > 0)
var/obj/item/weapon/tank/oxygen/O
var/obj/item/tank/oxygen/O
if(oxytanks.len == oxygentanks)
O = oxytanks[1]
oxytanks.Remove(O)
else
O = new /obj/item/weapon/tank/oxygen(loc)
O = new /obj/item/tank/oxygen(loc)
O.forceMove(loc)
to_chat(usr, "<span class='notice'>You take [O] out of [src].</span>")
oxygentanks--
update_icon()
if(href_list["phoron"])
if(phorontanks > 0)
var/obj/item/weapon/tank/phoron/P
var/obj/item/tank/phoron/P
if(platanks.len == phorontanks)
P = platanks[1]
platanks.Remove(P)
else
P = new /obj/item/weapon/tank/phoron(loc)
P = new /obj/item/tank/phoron(loc)
P.forceMove(loc)
to_chat(usr, "<span class='notice'>You take [P] out of [src].</span>")
phorontanks--
code/game/objects/structures/therapy.dm
+14 -14
View File
@@ -27,7 +27,7 @@
. = ..()
/obj/structure/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/bed/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob)
if(W.iswrench())
var/obj/structure/bed/chair/C = new /obj/structure/bed/chair(loc)
playsound(loc, W.usesound, 50, 1)
@@ -72,7 +72,7 @@
return
/obj/item/weapon/mesmetron
/obj/item/mesmetron
name = "mesmetron pocketwatch"
desc = "An elaborate pocketwatch, with captivating gold etching and an enchanting face. . ."
icon = 'icons/obj/items.dmi'
@@ -82,12 +82,12 @@
var/datum/weakref/thrall = null
var/time_counter = 0
/obj/item/weapon/mesmetron/Destroy()
/obj/item/mesmetron/Destroy()
STOP_PROCESSING(SSfast_process, src)
thrall = null
. = ..()
/obj/item/weapon/mesmetron/process()
/obj/item/mesmetron/process()
if (!thrall)
STOP_PROCESSING(SSfast_process, src)
return
@@ -112,7 +112,7 @@
else
STOP_PROCESSING(SSfast_process, src)
/obj/item/weapon/mesmetron/attack_self(mob/user as mob)
/obj/item/mesmetron/attack_self(mob/user as mob)
if(!thrall || !thrall.resolve())
thrall = null
to_chat(user, "You decipher the watch's mesmerizing face, discerning the time to be: '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [game_year]'.")
@@ -142,7 +142,7 @@
else
thrall = null
/obj/item/weapon/mesmetron/afterattack(mob/living/carbon/human/H, mob/user, proximity)
/obj/item/mesmetron/afterattack(mob/living/carbon/human/H, mob/user, proximity)
if(!proximity)
return
@@ -185,7 +185,7 @@
. = ..()
START_PROCESSING(SSfast_process, src)
/obj/structure/metronome/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/metronome/attackby(obj/item/W as obj, mob/user as mob)
if(W.iswrench())
playsound(src.loc, W.usesound, 50, 1)
if(anchored)
@@ -240,9 +240,9 @@
var/obj/machinery/chakraconsole/connected
component_types = list(
/obj/item/weapon/circuitboard/crystelpod,
/obj/item/weapon/stock_parts/capacitor = 2,
/obj/item/weapon/stock_parts/scanning_module = 2
/obj/item/circuitboard/crystelpod,
/obj/item/stock_parts/capacitor = 2,
/obj/item/stock_parts/scanning_module = 2
)
/obj/machinery/chakrapod/Destroy()
@@ -330,7 +330,7 @@
update_icon()
return
/obj/machinery/chakrapod/attackby(obj/item/weapon/grab/G, mob/user)
/obj/machinery/chakrapod/attackby(obj/item/grab/G, mob/user)
if (!istype(G) || !ishuman(G.affecting))
return
if (occupant)
@@ -418,9 +418,9 @@
var/crystal = 0
var/working = 0
component_types = list(
/obj/item/weapon/circuitboard/crystelpodconsole,
/obj/item/weapon/stock_parts/capacitor = 1,
/obj/item/weapon/stock_parts/scanning_module = 2
/obj/item/circuitboard/crystelpodconsole,
/obj/item/stock_parts/capacitor = 1,
/obj/item/stock_parts/scanning_module = 2
)
/obj/machinery/chakraconsole/ex_act(severity)
code/game/objects/structures/tranqcabinet.dm
+3 -3
View File
@@ -5,17 +5,17 @@
icon_state = "tranq_closed"
anchored = 1
density = 0
var/obj/item/weapon/gun/projectile/heavysniper/tranq/has_tranq
var/obj/item/gun/projectile/heavysniper/tranq/has_tranq
var/opened = 0
/obj/structure/tranqcabinet/New()
..()
has_tranq = new/obj/item/weapon/gun/projectile/heavysniper/tranq(src)
has_tranq = new/obj/item/gun/projectile/heavysniper/tranq(src)
/obj/structure/tranqcabinet/attackby(obj/item/O, mob/user)
if(isrobot(user))
return
if(istype(O, /obj/item/weapon/gun/projectile/heavysniper/tranq))
if(istype(O, /obj/item/gun/projectile/heavysniper/tranq))
if(!has_tranq && opened)
user.remove_from_mob(O)
contents += O
code/game/objects/structures/watercloset.dm
+14 -14
View File
@@ -54,9 +54,9 @@
update_icon()
return
if(istype(I, /obj/item/weapon/grab))
if(istype(I, /obj/item/grab))
usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
var/obj/item/weapon/grab/G = I
var/obj/item/grab/G = I
if(isliving(G.affecting))
var/mob/living/GM = G.affecting
@@ -110,8 +110,8 @@
anchored = 1
/obj/structure/urinal/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = I
if(istype(I, /obj/item/grab))
var/obj/item/grab/G = I
if(isliving(G.affecting))
var/mob/living/GM = G.affecting
if(G.state>1)
@@ -311,8 +311,8 @@
else
O.clean_blood()
if(istype(O, /obj/item/weapon/light))
var/obj/item/weapon/light/L = O
if(istype(O, /obj/item/light))
var/obj/item/light/L = O
L.brightness_color = initial(L.brightness_color)
L.update()
else if(istype(O, /obj/machinery/light))
@@ -361,7 +361,7 @@
else if(temperature <= H.species.cold_level_1)
to_chat(H, "<span class='warning'>The water is freezing cold!</span>")
/obj/item/weapon/bikehorn/rubberducky
/obj/item/bikehorn/rubberducky
name = "rubber ducky"
desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl
icon = 'icons/obj/watercloset.dmi'
@@ -428,7 +428,7 @@
return
// Filling/emptying open reagent containers
var/obj/item/weapon/reagent_containers/RG = O
var/obj/item/reagent_containers/RG = O
if (istype(RG) && RG.is_open_container())
var/atype = alert(usr, "Do you want to fill or empty \the [RG] at \the [src]?", "Fill or Empty", "Fill", "Empty", "Cancel")
@@ -460,8 +460,8 @@
return
// Filling/empying Syringes
else if (istype(O, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = O
else if (istype(O, /obj/item/reagent_containers/syringe))
var/obj/item/reagent_containers/syringe/S = O
switch(S.mode)
if(0) // draw
if(S.reagents.total_volume >= S.volume)
@@ -484,8 +484,8 @@
return
else if (istype(O, /obj/item/weapon/melee/baton))
var/obj/item/weapon/melee/baton/B = O
else if (istype(O, /obj/item/melee/baton))
var/obj/item/melee/baton/B = O
if(B.bcell)
if(B.bcell.charge > 0 && B.status == 1)
flick("baton_active", src)
@@ -500,9 +500,9 @@
user.visible_message("<span class='danger'>[user] was stunned by \the [O]!</span>")
return 1
// Short of a rewrite, this is necessary to stop monkeycubes being washed.
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
else if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
return
else if(istype(O, /obj/item/weapon/mop))
else if(istype(O, /obj/item/mop))
O.reagents.add_reagent("water", 5)
to_chat(user, "<span class='notice'>You wet \the [O] in \the [src].</span>")
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
code/game/objects/structures/windoor_assembly.dm
+5 -5
View File
@@ -19,7 +19,7 @@ obj/structure/windoor_assembly
w_class = 3
flags = ON_BORDER
var/obj/item/weapon/airlock_electronics/electronics = null
var/obj/item/airlock_electronics/electronics = null
//Vars to help with the icon's name
var/facing = "l" //Does the windoor open to the left or right?
@@ -70,7 +70,7 @@ obj/structure/windoor_assembly/Destroy()
switch(state)
if("01")
if(W.iswelder() && !anchored )
var/obj/item/weapon/weldingtool/WT = W
var/obj/item/weldingtool/WT = W
if (WT.remove_fuel(0,user))
user.visible_message("[user] dissassembles the windoor assembly.", "You start to dissassemble the windoor assembly.")
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
@@ -166,8 +166,8 @@ obj/structure/windoor_assembly/Destroy()
src.name = "Anchored Windoor Assembly"
//Adding airlock electronics for access. Step 6 complete.
else if(istype(W, /obj/item/weapon/airlock_electronics) && W:icon_state != "door_electronics_smoked")
var/obj/item/weapon/airlock_electronics/EL = W
else if(istype(W, /obj/item/airlock_electronics) && W:icon_state != "door_electronics_smoked")
var/obj/item/airlock_electronics/EL = W
if(!EL.inuse)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
@@ -194,7 +194,7 @@ obj/structure/windoor_assembly/Destroy()
src.name = "Secure Wired Windoor Assembly"
else
src.name = "Wired Windoor Assembly"
var/obj/item/weapon/airlock_electronics/ae = electronics
var/obj/item/airlock_electronics/ae = electronics
electronics = null
ae.forceMove(src.loc)
code/game/objects/structures/window.dm
+6 -6
View File
@@ -16,7 +16,7 @@
var/state = 2
var/reinf = 0
var/basestate
var/shardtype = /obj/item/weapon/material/shard
var/shardtype = /obj/item/material/shard
var/glasstype = null // Set this in subtypes. Null is assumed strange or otherwise impossible to dismantle, such as for shuttle glass.
var/silicate = 0 // number of units of silicate
@@ -213,8 +213,8 @@
/obj/structure/window/attackby(obj/item/W as obj, mob/user as mob)
if(!istype(W)) return//I really wish I did not need this
if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
var/obj/item/weapon/grab/G = W
if (istype(W, /obj/item/grab) && get_dist(src,user)<2)
var/obj/item/grab/G = W
if(istype(G.affecting,/mob/living))
grab_smash_attack(G, BRUTE)
return
@@ -266,7 +266,7 @@
..()
return
/obj/structure/window/proc/grab_smash_attack(obj/item/weapon/grab/G, var/damtype = BRUTE)
/obj/structure/window/proc/grab_smash_attack(obj/item/grab/G, var/damtype = BRUTE)
var/mob/living/M = G.affecting
var/mob/living/user = G.assailant
@@ -425,7 +425,7 @@
desc = "A borosilicate alloy window. It seems to be quite strong."
basestate = "phoronwindow"
icon_state = "phoronwindow"
shardtype = /obj/item/weapon/material/shard/phoron
shardtype = /obj/item/material/shard/phoron
glasstype = /obj/item/stack/material/glass/phoronglass
maximal_heat = T0C + 2000
damage_per_fire_tick = 1.0
@@ -436,7 +436,7 @@
desc = "A borosilicate alloy window, with rods supporting it. It seems to be very strong."
basestate = "phoronrwindow"
icon_state = "phoronrwindow"
shardtype = /obj/item/weapon/material/shard/phoron
shardtype = /obj/item/material/shard/phoron
glasstype = /obj/item/stack/material/glass/phoronrglass
reinf = 1
maximal_heat = T0C + 4000