mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 12:29:46 +01:00
Merge branch 'master' into placeholder
This commit is contained in:
Ferner
@@ -121,4 +121,11 @@
|
||||
name = "new gibson banner"
|
||||
desc = "A banner depicting the flag of New Gibson."
|
||||
icon_state = "newgibson_down"
|
||||
icon_up = "newgibson_up"
|
||||
icon_up = "newgibson_up"
|
||||
|
||||
/obj/structure/banner/scc
|
||||
name = "Stellar Corporate Conglomerate banner"
|
||||
desc = "A deep blue banner adorned with the logo of the Stellar Corporate Conglomerate."
|
||||
desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
|
||||
icon_state = "scc_banner_down"
|
||||
icon_up = "scc_banner_up"
|
||||
@@ -155,9 +155,12 @@
|
||||
if(linked_teleporter)
|
||||
if(linked_teleporter.last_use + 600 > world.time)
|
||||
return
|
||||
var/did_teleport = FALSE
|
||||
for(var/mob/M in contents)
|
||||
did_teleport = TRUE
|
||||
linked_teleporter.do_teleport(M)
|
||||
linked_teleporter.last_use = world.time
|
||||
if(did_teleport)
|
||||
linked_teleporter.last_use = world.time
|
||||
|
||||
playsound(get_turf(src), close_sound, 25, 0, -3)
|
||||
density = initial(density)
|
||||
|
||||
@@ -11,8 +11,9 @@
|
||||
icon_opened = "bio_generalopen"
|
||||
|
||||
/obj/structure/closet/l3closet/general/fill()
|
||||
new /obj/item/clothing/suit/bio_suit/general( src )
|
||||
new /obj/item/clothing/head/bio_hood/general( src )
|
||||
new /obj/item/clothing/suit/bio_suit/general(src)
|
||||
new /obj/item/clothing/head/bio_hood/general(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
|
||||
|
||||
/obj/structure/closet/l3closet/virology
|
||||
@@ -21,9 +22,9 @@
|
||||
icon_opened = "bio_virologyopen"
|
||||
|
||||
/obj/structure/closet/l3closet/virology/fill()
|
||||
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/clothing/suit/bio_suit/virology(src)
|
||||
new /obj/item/clothing/head/bio_hood/virology(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
new /obj/item/tank/oxygen(src)
|
||||
|
||||
|
||||
@@ -33,8 +34,9 @@
|
||||
icon_opened = "bio_securityopen"
|
||||
|
||||
/obj/structure/closet/l3closet/security/fill()
|
||||
new /obj/item/clothing/suit/bio_suit/security( src )
|
||||
new /obj/item/clothing/head/bio_hood/security( src )
|
||||
new /obj/item/clothing/suit/bio_suit/security(src)
|
||||
new /obj/item/clothing/head/bio_hood/security(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
|
||||
|
||||
/obj/structure/closet/l3closet/janitor
|
||||
@@ -43,8 +45,8 @@
|
||||
icon_opened = "bio_janitoropen"
|
||||
|
||||
/obj/structure/closet/l3closet/janitor/fill()
|
||||
new /obj/item/clothing/suit/bio_suit/janitor( src )
|
||||
new /obj/item/clothing/head/bio_hood/janitor( src )
|
||||
new /obj/item/clothing/suit/bio_suit/janitor(src)
|
||||
new /obj/item/clothing/head/bio_hood/janitor(src)
|
||||
|
||||
|
||||
/obj/structure/closet/l3closet/scientist
|
||||
@@ -53,5 +55,6 @@
|
||||
icon_opened = "bio_scientistopen"
|
||||
|
||||
/obj/structure/closet/l3closet/scientist/fill()
|
||||
new /obj/item/clothing/suit/bio_suit/scientist( src )
|
||||
new /obj/item/clothing/head/bio_hood/scientist( src )
|
||||
new /obj/item/clothing/suit/bio_suit/scientist(src)
|
||||
new /obj/item/clothing/head/bio_hood/scientist(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
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/mask/gas/half(src)
|
||||
new /obj/item/device/multitool(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/taperoll/engineering(src)
|
||||
@@ -129,6 +130,7 @@
|
||||
new /obj/item/device/radio/headset/headset_eng/alt(src)
|
||||
new /obj/item/clothing/suit/storage/hazardvest(src)
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
new /obj/item/taperoll/engineering(src)
|
||||
new /obj/item/clothing/accessory/storage/overalls/engineer(src)
|
||||
|
||||
@@ -159,6 +161,7 @@
|
||||
new /obj/item/device/radio/headset/headset_eng/alt(src)
|
||||
new /obj/item/clothing/suit/storage/hazardvest/blue/atmos(src)
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
new /obj/item/taperoll/engineering(src)
|
||||
new /obj/item/clothing/accessory/storage/overalls/engineer(src)
|
||||
new /obj/item/rfd/piping(src)
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
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/clothing/mask/gas/half(src)
|
||||
new /obj/item/watertank(src)
|
||||
new /obj/item/storage/belt/hydro(src)
|
||||
new /obj/item/clothing/gloves/botanic_leather(src)
|
||||
|
||||
@@ -120,8 +120,8 @@
|
||||
new /obj/item/device/radio(src)
|
||||
new /obj/item/roller(src)
|
||||
new /obj/item/crowbar/red(src)
|
||||
|
||||
|
||||
new /obj/item/clothing/mask/gas/alt(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/CMO
|
||||
name = "chief medical officer's locker"
|
||||
@@ -217,6 +217,8 @@
|
||||
new /obj/item/storage/box/syringes(src)
|
||||
new /obj/item/storage/box/beakers(src)
|
||||
new /obj/item/storage/box/beakers(src)
|
||||
new /obj/item/storage/bag/chemistry(src)
|
||||
new /obj/item/storage/bag/chemistry(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/medical_wall
|
||||
name = "first aid closet"
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
new /obj/item/clothing/head/beret/security/hos/corp(src)
|
||||
new /obj/item/clothing/head/hos/corp(src)
|
||||
new /obj/item/clothing/head/helmet/hos(src)
|
||||
new /obj/item/clothing/suit/security/hos(src)
|
||||
new /obj/item/clothing/suit/storage/security/hos(src)
|
||||
new /obj/item/clothing/accessory/badge/hos(src)
|
||||
new /obj/item/clothing/gloves/black_leather(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/armor/hos(src)
|
||||
@@ -190,7 +190,7 @@
|
||||
new /obj/item/clothing/head/beret/security/corp(src)
|
||||
new /obj/item/clothing/head/hos/corp(src)
|
||||
new /obj/item/clothing/head/helmet/hos(src)
|
||||
new /obj/item/clothing/suit/security/hos(src)
|
||||
new /obj/item/clothing/suit/storage/security/hos(src)
|
||||
//Tools
|
||||
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
|
||||
new /obj/item/device/radio/headset/heads/hos(src)
|
||||
@@ -236,7 +236,7 @@
|
||||
new /obj/item/clothing/head/beret/security/corp(src)
|
||||
new /obj/item/clothing/head/warden/corp(src)
|
||||
new /obj/item/clothing/head/helmet/security(src)
|
||||
new /obj/item/clothing/suit/security/warden(src)
|
||||
new /obj/item/clothing/suit/storage/security/warden(src)
|
||||
new /obj/item/clothing/accessory/badge/warden(src)
|
||||
new /obj/item/clothing/gloves/black_leather(src)
|
||||
//Tools
|
||||
@@ -323,9 +323,10 @@
|
||||
new /obj/item/clothing/head/beret/security/corp(src)
|
||||
new /obj/item/clothing/head/softcap/security/corp(src)
|
||||
new /obj/item/clothing/head/helmet/security(src)
|
||||
new /obj/item/clothing/suit/security/officer(src)
|
||||
new /obj/item/clothing/suit/storage/security/officer(src)
|
||||
new /obj/item/clothing/accessory/badge/officer(src)
|
||||
new /obj/item/clothing/mask/gas/alt(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
//Tools
|
||||
new /obj/item/device/radio/headset/headset_sec(src)
|
||||
new /obj/item/device/radio/headset/headset_sec/alt(src)
|
||||
@@ -369,36 +370,8 @@
|
||||
new /obj/item/device/encryptionkey/headset_med(src)
|
||||
|
||||
|
||||
/obj/structure/closet/secure_closet/detective
|
||||
name = "detective's locker"
|
||||
req_access = list(access_detective)
|
||||
icon_state = "sec1"
|
||||
icon_closed = "sec"
|
||||
icon_locked = "sec1"
|
||||
icon_opened = "secopen"
|
||||
icon_broken = "secbroken"
|
||||
icon_off = "secoff"
|
||||
|
||||
/obj/structure/closet/secure_closet/detective/fill()
|
||||
//Appearance
|
||||
new /obj/item/clothing/suit/storage/det_jacket(src)
|
||||
new /obj/item/clothing/under/det(src)
|
||||
new /obj/item/clothing/under/det/black(src)
|
||||
new /obj/item/clothing/under/det/classic(src)
|
||||
new /obj/item/clothing/accessory/badge/dia(src)
|
||||
new /obj/item/clothing/gloves/black(src)
|
||||
new /obj/item/clothing/shoes/brown(src)
|
||||
//Tools
|
||||
new /obj/item/device/radio/headset/headset_sec(src)
|
||||
new /obj/item/device/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/clothing/suit/armor/carrier/generic(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/miniature/security(src)
|
||||
new /obj/item/taperoll/police(src)
|
||||
//Belts
|
||||
new /obj/item/clothing/accessory/holster/waist(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/csi
|
||||
name = "forensic technician's locker"
|
||||
/obj/structure/closet/secure_closet/investigator
|
||||
name = "investigator's locker"
|
||||
req_access = list(access_forensics_lockers)
|
||||
icon_state = "sec1"
|
||||
icon_closed = "sec"
|
||||
@@ -407,24 +380,28 @@
|
||||
icon_broken = "secbroken"
|
||||
icon_off = "secoff"
|
||||
|
||||
/obj/structure/closet/secure_closet/csi/fill()
|
||||
/obj/structure/closet/secure_closet/investigator/fill()
|
||||
//Appearance
|
||||
new /obj/item/clothing/gloves/black(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/forensics(src)
|
||||
new /obj/item/clothing/suit/armor/carrier/generic(src)
|
||||
new /obj/item/clothing/under/det/forensics(src)
|
||||
new /obj/item/clothing/suit/storage/det_jacket(src)
|
||||
new /obj/item/clothing/under/det(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
|
||||
new /obj/item/clothing/under/det/black(src)
|
||||
new /obj/item/clothing/under/det/classic(src)
|
||||
new /obj/item/clothing/accessory/badge/dia(src)
|
||||
new /obj/item/clothing/suit/storage/toggle/forensics(src)
|
||||
new /obj/item/clothing/gloves/black(src)
|
||||
new /obj/item/clothing/shoes/brown(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/miniature/security(src)
|
||||
//Tools
|
||||
new /obj/item/device/radio/headset/headset_sec(src)
|
||||
new /obj/item/device/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/storage/box/evidence(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/clothing/suit/armor/carrier/generic(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/miniature/security(src)
|
||||
new /obj/item/taperoll/police(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/device/laser_pointer/blue(src)
|
||||
//Belts
|
||||
new /obj/item/clothing/accessory/holster/waist(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/injection
|
||||
name = "lethal injections locker"
|
||||
|
||||
@@ -75,6 +75,7 @@
|
||||
|
||||
/obj/structure/closet/statue/proc/create_icon(var/mob/living/L)
|
||||
appearance = L
|
||||
appearance_flags |= KEEP_TOGETHER
|
||||
dir = L.dir
|
||||
color = list(
|
||||
0.30, 0.3, 0.25,
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
new /obj/item/clothing/mask/gas/alt(src)
|
||||
new /obj/item/tank/emergency_oxygen/engi(src)
|
||||
new /obj/item/clothing/mask/gas/alt(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
new /obj/item/device/oxycandle(src)
|
||||
new /obj/item/device/oxycandle(src)
|
||||
new /obj/item/airbubble(src)
|
||||
@@ -61,6 +62,8 @@
|
||||
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/clothing/mask/gas/alt(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
new /obj/item/storage/firstaid/o2(src)
|
||||
new /obj/item/clothing/suit/space/emergency(src)
|
||||
new /obj/item/clothing/suit/space/emergency(src)
|
||||
|
||||
@@ -344,118 +344,124 @@
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
|
||||
//ninja stuff
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja
|
||||
var/associated_hardsuit = /obj/item/rig/light/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_sol/fill()
|
||||
new /obj/item/rig/military/ninja(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/fill()
|
||||
new associated_hardsuit(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/stealth/fill()
|
||||
..()
|
||||
new /obj/item/gun/projectile/pistol(src)
|
||||
new /obj/item/silencer(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/sol
|
||||
associated_hardsuit = /obj/item/rig/military/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/sol/fill()
|
||||
..()
|
||||
new /obj/item/clothing/under/rank/fatigues/marine(src)
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(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/gun/projectile/pistol/sol(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_gunslinger/fill()
|
||||
new /obj/item/rig/gunslinger/ninja(src)
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(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(src)
|
||||
new /obj/item/ammo_magazine/gauss/emp(src)
|
||||
new /obj/item/gun/projectile/colt(src)
|
||||
new /obj/item/ammo_magazine/c45m(src)
|
||||
new /obj/item/ammo_magazine/c45m(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/gunslinger
|
||||
associated_hardsuit = /obj/item/rig/gunslinger/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_breacher/fill()
|
||||
new /obj/item/rig/unathi/fancy/ninja(src)
|
||||
new /obj/item/melee/energy/sword/hegemony(src)
|
||||
new /obj/item/shield/energy/hegemony(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/gunslinger/fill()
|
||||
..()
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(src)
|
||||
new /obj/item/gun/projectile/revolver/detective(src)
|
||||
new /obj/item/ammo_magazine/c38(src)
|
||||
new /obj/item/ammo_magazine/c38(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/breacher
|
||||
associated_hardsuit = /obj/item/rig/unathi/fancy/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/breacher/fill()
|
||||
..()
|
||||
new /obj/item/gun/energy/pistol/hegemony(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_tesla/fill()
|
||||
new /obj/item/rig/tesla/ninja(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/tesla
|
||||
associated_hardsuit = /obj/item/rig/tesla/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/tesla/fill()
|
||||
..()
|
||||
new /obj/item/device/augment_implanter/advanced_tesla(src)
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(src)
|
||||
new /obj/item/gun/projectile/automatic/rifle/adhomian(src)
|
||||
new /obj/item/ammo_magazine/boltaction(src)
|
||||
new /obj/item/ammo_magazine/boltaction(src)
|
||||
new /obj/item/ammo_magazine/boltaction(src)
|
||||
new /obj/item/ammo_magazine/boltaction(src)
|
||||
new /obj/item/ammo_magazine/boltaction(src)
|
||||
new /obj/item/gun/projectile/pistol/adhomai(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
new /obj/item/device/augment_implanter/advanced_tesla(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_strike/fill()
|
||||
new /obj/item/rig/strike/ninja(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/strike
|
||||
associated_hardsuit = /obj/item/rig/strike/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/strike/fill()
|
||||
..()
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(src)
|
||||
new /obj/item/gun/energy/rifle(src)
|
||||
new /obj/item/gun/projectile/automatic/x9(src)
|
||||
new /obj/item/ammo_magazine/c45x(src)
|
||||
new /obj/item/ammo_magazine/c45x(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_jinxiang/fill()
|
||||
new /obj/item/rig/jinxiang/ninja(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/jinxiang
|
||||
associated_hardsuit = /obj/item/rig/jinxiang/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/jinxiang/fill()
|
||||
..()
|
||||
new /obj/item/melee/energy/sword/pirate(src)
|
||||
new /obj/item/shield/energy/dominia(src)
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(src)
|
||||
new /obj/item/gun/projectile/tanto(src)
|
||||
new /obj/item/ammo_magazine/mc10mm(src)
|
||||
new /obj/item/ammo_magazine/mc10mm(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_elyra/fill()
|
||||
new /obj/item/rig/elyran/ninja(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/elyra
|
||||
associated_hardsuit = /obj/item/rig/elyran/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/elyra/fill()
|
||||
..()
|
||||
new /obj/item/gun/projectile/plasma(src)
|
||||
new /obj/item/ammo_magazine/plasma(src)
|
||||
new /obj/item/ammo_magazine/plasma(src)
|
||||
new /obj/item/ammo_magazine/plasma(src)
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(src)
|
||||
new /obj/item/gun/projectile/pistol(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_hacker/fill()
|
||||
new /obj/item/rig/light/hacker/ninja(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/hacker/fill()
|
||||
associated_hardsuit = /obj/item/rig/light/hacker/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/hacker/fill()
|
||||
..()
|
||||
new /obj/item/gun/energy/xray(src)
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(src)
|
||||
new /obj/item/gun/energy/crossbow/largecrossbow(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_techno/fill()
|
||||
new /obj/item/rig/light/offworlder/techno/ninja(src)
|
||||
new /obj/item/gun/projectile/automatic/rifle/sts35(src)
|
||||
new /obj/item/ammo_magazine/c762(src)
|
||||
new /obj/item/ammo_magazine/c762(src)
|
||||
new /obj/item/ammo_magazine/c762(src)
|
||||
new /obj/item/ammo_magazine/c762(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/techno
|
||||
associated_hardsuit = /obj/item/rig/light/offworlder/techno/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/techno/fill()
|
||||
..()
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(src)
|
||||
new /obj/item/gun/projectile/pistol(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_crimson/fill()
|
||||
new /obj/item/rig/merc/ninja(src)
|
||||
new /obj/item/gun/projectile/automatic/c20r(src)
|
||||
new /obj/item/ammo_magazine/a10mm(src)
|
||||
new /obj/item/ammo_magazine/a10mm(src)
|
||||
new /obj/item/ammo_magazine/a10mm(src)
|
||||
new /obj/item/ammo_magazine/a10mm(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/crimson
|
||||
associated_hardsuit = /obj/item/rig/merc/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/crimson/fill()
|
||||
..()
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(src)
|
||||
new /obj/item/gun/projectile/revolver(src)
|
||||
new /obj/item/ammo_magazine/a357(src)
|
||||
new /obj/item/ammo_magazine/a357(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja_rhino/fill()
|
||||
new /obj/item/rig/merc/distress/ninja(src)
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/rhino
|
||||
associated_hardsuit = /obj/item/rig/merc/distress/ninja
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/ninja/rhino/fill()
|
||||
..()
|
||||
new /obj/item/gun/projectile/automatic/rifle/sts35(src)
|
||||
new /obj/item/ammo_magazine/c762(src)
|
||||
new /obj/item/ammo_magazine/c762(src)
|
||||
new /obj/item/ammo_magazine/c762(src)
|
||||
new /obj/item/ammo_magazine/c762(src)
|
||||
new /obj/item/clothing/accessory/holster/armpit/brown(src)
|
||||
new /obj/item/gun/projectile/pistol(src)
|
||||
new /obj/item/ammo_magazine/mc9mm(src)
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
density = 0
|
||||
anchored = 1
|
||||
var/shattered = 0
|
||||
var/list/ui_users = list()
|
||||
|
||||
/obj/structure/mirror/attack_hand(mob/user as mob)
|
||||
if(shattered)
|
||||
@@ -19,12 +18,8 @@
|
||||
to_chat(user, "<span class='notice'>Your reflection appears distorted on the surface of \the [src].</span>")
|
||||
|
||||
if(ishuman(user))
|
||||
var/datum/nano_module/appearance_changer/AC = ui_users[user]
|
||||
if(!AC)
|
||||
AC = new(src, user)
|
||||
AC.name = "SalonPro Nano-Mirror™"
|
||||
ui_users[user] = AC
|
||||
AC.ui_interact(user)
|
||||
var/mob/living/carbon/human/H = user
|
||||
H.change_appearance(APPEARANCE_HAIR, H, FALSE, ui_state = default_state, state_object = src)
|
||||
|
||||
/obj/structure/mirror/proc/shatter()
|
||||
if(shattered) return
|
||||
@@ -69,19 +64,11 @@
|
||||
user.visible_message("<span class='danger'>[user] hits [src] and bounces off!</span>")
|
||||
return 1
|
||||
|
||||
/obj/structure/mirror/Destroy()
|
||||
for(var/user in ui_users)
|
||||
var/datum/nano_module/appearance_changer/AC = ui_users[user]
|
||||
qdel(AC)
|
||||
ui_users.Cut()
|
||||
return ..()
|
||||
|
||||
/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/mirror/attack_self(mob/user as mob)
|
||||
if(user.mind)
|
||||
@@ -90,17 +77,5 @@
|
||||
to_chat(user, "<span class='notice'>Your reflection appears distorted on the surface of \the [src].</span>")
|
||||
|
||||
if(ishuman(user))
|
||||
var/datum/nano_module/appearance_changer/AC = ui_users[user]
|
||||
if(!AC)
|
||||
AC = new(src, user)
|
||||
AC.name = "SalonPro Nano-Mirror™"
|
||||
AC.flags = APPEARANCE_HAIR
|
||||
ui_users[user] = AC
|
||||
AC.ui_interact(user)
|
||||
|
||||
/obj/item/mirror/Destroy()
|
||||
for(var/user in ui_users)
|
||||
var/datum/nano_module/appearance_changer/AC = ui_users[user]
|
||||
qdel(AC)
|
||||
ui_users.Cut()
|
||||
return ..()
|
||||
var/mob/living/carbon/human/H = user
|
||||
H.change_appearance(APPEARANCE_HAIR, H, FALSE, ui_state = default_state, state_object = src)
|
||||
@@ -324,6 +324,7 @@
|
||||
flag_path = "solgov"
|
||||
|
||||
/obj/item/flag/sol/l
|
||||
name = "Large Sol Alliance flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/dominia
|
||||
@@ -343,6 +344,7 @@
|
||||
flag_path = "dominia"
|
||||
|
||||
/obj/item/flag/dominia/l
|
||||
name = "Large Dominian Empire flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/elyra
|
||||
@@ -362,6 +364,7 @@
|
||||
flag_path = "elyra"
|
||||
|
||||
/obj/item/flag/elyra/l
|
||||
name = "Large Elyran flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/hegemony
|
||||
@@ -381,6 +384,7 @@
|
||||
flag_path = "izweski"
|
||||
|
||||
/obj/item/flag/hegemony/l
|
||||
name = "Large Hegemony flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/jargon
|
||||
@@ -400,6 +404,7 @@
|
||||
flag_path = "jargon"
|
||||
|
||||
/obj/item/flag/jargon/l
|
||||
name = "Large Jargon Federation flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/nanotrasen
|
||||
@@ -419,6 +424,7 @@
|
||||
flag_path = "nanotrasen"
|
||||
|
||||
/obj/item/flag/nanotrasen/l
|
||||
name = "Large NanoTrasen Corporation flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/eridani
|
||||
@@ -438,6 +444,7 @@
|
||||
flag_path = "eridani"
|
||||
|
||||
/obj/item/flag/eridani/l
|
||||
name = "Large Eridani Corporate Federation flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/coalition
|
||||
@@ -457,6 +464,7 @@
|
||||
flag_path = "coalition"
|
||||
|
||||
/obj/item/flag/coalition/l
|
||||
name = "Large Coalition of Colonies flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/vaurca
|
||||
@@ -476,6 +484,7 @@
|
||||
flag_path = "sedantis"
|
||||
|
||||
/obj/item/flag/vaurca/l
|
||||
name = "Large Sedantis flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/america
|
||||
@@ -495,6 +504,7 @@
|
||||
flag_path = "oldglory"
|
||||
|
||||
/obj/item/flag/america/l
|
||||
name = "Large Old World flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/item/flag/dpra
|
||||
@@ -507,6 +517,7 @@
|
||||
nation they were fighting for the Democratic People's Republic of Adhomai."
|
||||
|
||||
/obj/item/flag/dpra/l
|
||||
name = "Large Democratic People's Republic of Adhomai flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/dpra
|
||||
@@ -536,6 +547,7 @@
|
||||
|
||||
/obj/item/flag/pra/l
|
||||
flag_size = 1
|
||||
name = "Large People's Republic of Adhomai flag"
|
||||
|
||||
/obj/structure/sign/flag/pra
|
||||
name = "People's Republic of Adhomai flag"
|
||||
@@ -565,6 +577,7 @@
|
||||
|
||||
/obj/item/flag/nka/l
|
||||
flag_size = 1
|
||||
name = "Large New Kingdom of Adhomai flag"
|
||||
|
||||
/obj/structure/sign/flag/nka
|
||||
name = "New Kingdom of Adhomai flag"
|
||||
@@ -588,6 +601,7 @@
|
||||
flag_path = "heph"
|
||||
|
||||
/obj/item/flag/heph/l
|
||||
name = "Large Hephaestus Industries flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/heph
|
||||
@@ -607,6 +621,7 @@
|
||||
flag_path = "zenghu"
|
||||
|
||||
/obj/item/flag/zenghu/l
|
||||
name = "Large Zeng-Hu Pharmaceuticals flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/zenghu
|
||||
@@ -645,6 +660,7 @@
|
||||
flag_path = "zavodskoi"
|
||||
|
||||
/obj/item/flag/zavodskoi/l
|
||||
name = "Large Zavodskoi Interstellar flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/idris
|
||||
@@ -664,6 +680,7 @@
|
||||
flag_path = "idris"
|
||||
|
||||
/obj/item/flag/idris/l
|
||||
name = "Large Idris Incorporated flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/trinaryperfection
|
||||
@@ -686,6 +703,7 @@
|
||||
flag_path = "trinaryperfection"
|
||||
|
||||
/obj/item/flag/trinaryperfection/l
|
||||
name = "Large Trinary Perfection flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/item/flag/diona
|
||||
@@ -698,6 +716,65 @@
|
||||
desc = "A green Dominian standard which represents the dionae within the Empire."
|
||||
icon_state = "diona"
|
||||
|
||||
/obj/item/flag/strelitz
|
||||
name = "House Strelitz standard"
|
||||
desc = "A red-and-dark standard with a gold trim that represents House Strelitz, one of the great houses of the Empire of Dominia. \
|
||||
They are known for their military service and emphasis on personal bravery."
|
||||
flag_path = "strelitz"
|
||||
|
||||
/obj/structure/sign/flag/strelitz
|
||||
name = "House Strelitz standard"
|
||||
desc = "A red-and-dark standard with a gold trim that represents House Strelitz, one of the great houses of the Empire of Dominia. \
|
||||
They are known for their military service and emphasis on personal bravery."
|
||||
icon_state = "strelitz"
|
||||
|
||||
/obj/item/flag/volvalaad
|
||||
name = "House Volvalaad standard"
|
||||
desc = "A blue-and-black standard which represents House Volvalaad, one of the great houses of the Empire of Dominia. \
|
||||
They are known for their reformist ideals, and scientific prowess."
|
||||
flag_path = "volvalaad"
|
||||
|
||||
/obj/structure/sign/flag/volvalaad
|
||||
name = "House Volvalaad standard"
|
||||
desc = "A blue-and-black standard which represents House Volvalaad, one of the great houses of the Empire of Dominia. \
|
||||
They are known for their Habsburgian inbreeding, reformist ideals, and scientific prowess."
|
||||
icon_state = "volvalaad"
|
||||
|
||||
/obj/item/flag/kazkhz
|
||||
name = "House Kazkhz standard"
|
||||
desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz, one of the great houses of the \
|
||||
Empire of Dominia. They are known for their conservative nature and aversion to augmentation."
|
||||
flag_path = "kazkhz"
|
||||
|
||||
/obj/structure/sign/flag/kazkhz
|
||||
name = "House Kazkhz standard"
|
||||
desc = "A red-and-orange standard with a circular chevron which represents House Kazhkz, one of the great houses of the \
|
||||
Empire of Dominia. They are known for their conservative nature and aversion to augmentation."
|
||||
icon_state = "kazkhz"
|
||||
|
||||
/obj/item/flag/caladius
|
||||
name = "House Caladius standard"
|
||||
desc = "A purple standard which represensts House Caladius, one of the great houses of the Empire of Dominia. They are \
|
||||
known for their support of the Dominian clergy as well as the skill of their bureaucrats and economists."
|
||||
flag_path = "caladius"
|
||||
|
||||
/obj/structure/sign/flag/caladius
|
||||
name = "House Caladius standard"
|
||||
desc = "A purple standard which represensts House Caladius, one of the great houses of the Empire of Dominia. They are \
|
||||
known for their support of the Dominian clergy as well as the skill of their bureaucrats and economists."
|
||||
icon_state = "caladius"
|
||||
|
||||
/obj/item/flag/zhao
|
||||
name = "House Zhao standard"
|
||||
desc = "A white Dominian standard with a prominent grey circle which represents House Zhao, one of the great houses of \
|
||||
known for its naval officers and patronage of the Dominian shipbuilding industry."
|
||||
flag_path = "zhao"
|
||||
|
||||
/obj/structure/sign/flag/zhao
|
||||
name = "House Zhao standard"
|
||||
desc = "A white Dominian standard with a prominent grey circle which represents House Zhao, one of the great houses of \
|
||||
known for its naval officers and patronage of the Dominian shipbuilding and naval industries."
|
||||
icon_state = "zhao"
|
||||
|
||||
/obj/structure/sign/flag/biesel
|
||||
name = "Republic of Biesel flag"
|
||||
@@ -719,6 +796,80 @@
|
||||
name = "Large Republic of Biesel flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/scc
|
||||
name = "Stellar Corporate Conglomerate flag"
|
||||
desc = "The colours and logo of the Stellar Corporate Conglomerate."
|
||||
desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
|
||||
icon_state = "scc"
|
||||
|
||||
/obj/structure/sign/flag/scc/left
|
||||
icon_state = "scc_l"
|
||||
|
||||
/obj/structure/sign/flag/scc/right
|
||||
icon_state = "scc_r"
|
||||
|
||||
/obj/item/flag/scc
|
||||
name = "Stellar Corporate Conglomerate flag"
|
||||
desc = "The flag representing the Stellar Corporate Conglomerate."
|
||||
desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
|
||||
flag_path = "scc"
|
||||
|
||||
/obj/item/flag/scc/l
|
||||
name = "Large Stellar Corporate Conglomerate flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/item/flag/fisanduh
|
||||
name = "Confederated States of Fisanduh flag"
|
||||
desc = "A flag of the fallen Confederated States of Fisanduh."
|
||||
desc_fluff = "The red-gold-white flag of the Confederated States of Fisanduh and, by extention, the Fisanduh Freedom Front. Due to its origins, possession of such a flag in the Empire outside of Fisanduh itself can carry an extremely harsh punishment if one is an Imperial citizen or \
|
||||
subject. This has not stopped it from becoming a symbol of resistance, and reproductions are extremely common in more rebellious areas of the Empire. Even if they are beaten-down and run ragged by war, the spirit of Fisanduh will live forever in the hearts of its people."
|
||||
flag_path = "fisanduh"
|
||||
|
||||
/obj/structure/sign/flag/fisanduh
|
||||
name = "Confederated States of Fisanduh flag"
|
||||
desc = "A flag of the fallen Confederated States of Fisanduh."
|
||||
desc_fluff = "The red-gold-white flag of the Confederated States of Fisanduh and, by extention, the Fisanduh Freedom Front. Due to its origins, possession of such a flag in the Empire outside of Fisanduh itself can carry an extremely harsh punishment if one is an Imperial citizen or \
|
||||
subject. This has not stopped it from becoming a symbol of resistance, and reproductions are extremely common in more rebellious areas of the Empire. Even if they are beaten-down and run ragged by war, the spirit of Fisanduh will live forever in the hearts of its people."
|
||||
icon_state = "fisanduh"
|
||||
|
||||
/obj/item/flag/fisanduh/l
|
||||
name = "large Confederated States of Fisanduh flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/fisanduh/left
|
||||
icon_state = "fisanduh_l"
|
||||
|
||||
/obj/structure/sign/flag/fisanduh/right
|
||||
icon_state = "fisanduh_r"
|
||||
|
||||
/obj/item/flag/gadpathur
|
||||
name = "United Planetary Defense Council of Gadpathur flag"
|
||||
desc = "The black and brown flag of Gadpathur, featuring the planet's commonly-seen sun iconography in the centre. The Gadpathurian flag is a common sight in the Coalition's military, and can be seen everywhere on Gadpathur -- from lighters to ID card to government buildings. \
|
||||
It is uncommonly seen outside of the Coalition as a symbol of anti-Solarian sentiment."
|
||||
desc_fluff = "The Gadpathurian flag is, surprisingly, a variation of the common flag of its hated enemy: the Alliance of Sovereign Solarian Nations. The reason for this is simple: in the immediate aftermath of the planet's orbital bombardment by the Solarian \
|
||||
Navy the most common flags available for the various successor states were the ASSN flags still flying over the ruins of government buildings. The black-brown flag of Ashia Patvardhan's Gadpathurian Reunification League that is now Gadpathur's flag was simply one of many of \
|
||||
these variant flags before the League's reunification. The black and brown represent the plant itself, while the red-and-gold sun represents that the people of the plant are still alive and burning with a desire to never again fall."
|
||||
flag_path = "gadpathur"
|
||||
|
||||
/obj/structure/sign/flag/gadpathur
|
||||
name = "United Planetary Defense Council of Gadpathur flag"
|
||||
desc = "The black and brown flag of Gadpathur, featuring the planet's commonly-seen sun iconography in the centre. The Gadpathurian flag is a common sight in the Coalition's military, and can be seen everywhere on Gadpathur -- from lighters to ID card to government buildings. \
|
||||
It is uncommonly seen outside of the Coalition as a symbol of anti-Solarian sentiment."
|
||||
desc_fluff = "The Gadpathurian flag is, surprisingly, a variation of the common flag of its hated enemy: the Alliance of Sovereign Solarian Nations. The reason for this is simple: in the immediate aftermath of the planet's orbital bombardment by the Solarian \
|
||||
Navy the most common flags available for the various successor states were the ASSN flags still flying over the ruins of government buildings. The black-brown flag of Ashia Patvardhan's Gadpathurian Reunification League that is now Gadpathur's flag was simply one of many of \
|
||||
these variant flags before the League's reunification. The black and brown represent the plant itself, while the red-and-gold sun represents that the people of the plant are still alive and burning with a desire to never again fall."
|
||||
icon_state = "gadpathur"
|
||||
|
||||
/obj/item/flag/gadpathur/l
|
||||
name = "large United Planetary Defense Council of Gadpathur flag"
|
||||
flag_size = 1
|
||||
|
||||
/obj/structure/sign/flag/gadpathur/left
|
||||
icon_state = "gadpathur_l"
|
||||
|
||||
/obj/structure/sign/flag/gadpathur/right
|
||||
icon_state = "gadpathur_r"
|
||||
|
||||
/obj/item/flag/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
|
||||
if (!adjacent)
|
||||
return
|
||||
@@ -765,10 +916,14 @@
|
||||
P2.pixel_y = 32
|
||||
P2.name = name
|
||||
P2.desc = desc
|
||||
P2.desc_info = desc_info
|
||||
P2.desc_fluff = desc_fluff
|
||||
else
|
||||
P.icon_state = "[flag_path]"
|
||||
P.name = name
|
||||
P.desc = desc
|
||||
P.desc_info = desc_info
|
||||
P.desc_fluff = desc_fluff
|
||||
qdel(src)
|
||||
|
||||
|
||||
|
||||
@@ -1,53 +1,62 @@
|
||||
// Basically they are for the firing range
|
||||
// Target stakes for the firing range.
|
||||
/obj/structure/target_stake
|
||||
name = "target stake"
|
||||
desc = "A thin platform with negatively-magnetized wheels."
|
||||
icon = 'icons/obj/target_stake.dmi'
|
||||
icon_state = "target_stake"
|
||||
density = 1
|
||||
w_class = ITEMSIZE_HUGE
|
||||
flags = CONDUCT
|
||||
var/obj/item/target/pinned_target // the current pinned target
|
||||
density = TRUE
|
||||
w_class = ITEMSIZE_IMMENSE
|
||||
build_amt = 10
|
||||
var/obj/item/target/pinned_target
|
||||
|
||||
Move()
|
||||
..()
|
||||
// Move the pinned target along with the stake
|
||||
if(pinned_target in view(3, src))
|
||||
pinned_target.forceMove(loc)
|
||||
/obj/structure/target_stake/Initialize(mapload)
|
||||
. = ..()
|
||||
material = SSmaterials.get_material_by_name(MATERIAL_STEEL)
|
||||
|
||||
else // Sanity check: if the pinned target can't be found in immediate view
|
||||
pinned_target = null
|
||||
density = 1
|
||||
|
||||
attackby(obj/item/W as obj, mob/user as mob)
|
||||
// Putting objects on the stake. Most importantly, targets
|
||||
/obj/structure/target_stake/attackby(var/obj/item/W, var/mob/user)
|
||||
if(istype(W, /obj/item/target))
|
||||
if(pinned_target)
|
||||
return // get rid of that pinned target first!
|
||||
|
||||
if(istype(W, /obj/item/target))
|
||||
density = 0
|
||||
W.density = 1
|
||||
user.remove_from_mob(W)
|
||||
W.forceMove(loc)
|
||||
W.layer = 3.1
|
||||
pinned_target = W
|
||||
to_chat(user, "You slide the target into the stake.")
|
||||
to_chat(user, SPAN_WARNING("\The [src] already has a target."))
|
||||
return
|
||||
if(user.unEquip(W, FALSE, get_turf(src)))
|
||||
to_chat(user, SPAN_NOTICE("You slide \the [W] into the stake."))
|
||||
set_target(W)
|
||||
return
|
||||
|
||||
attack_hand(mob/user as mob)
|
||||
// taking pinned targets off!
|
||||
if(W.iswrench())
|
||||
if(pinned_target)
|
||||
density = 1
|
||||
pinned_target.density = 0
|
||||
to_chat(user, SPAN_WARNING("You cannot dismantle \the [src] while it has a target attached."))
|
||||
return
|
||||
dismantle()
|
||||
|
||||
/obj/structure/target_stake/attack_hand(var/mob/user)
|
||||
. = ..()
|
||||
if(pinned_target && ishuman(user))
|
||||
var/obj/item/target/T = pinned_target
|
||||
to_chat(user, SPAN_NOTICE("You take \the [T] out of the stake."))
|
||||
set_target(null)
|
||||
user.put_in_hands(T)
|
||||
|
||||
/obj/structure/target_stake/proc/set_target(var/obj/item/target/T)
|
||||
if(T)
|
||||
density = FALSE
|
||||
T.density = TRUE
|
||||
T.pixel_x = 0
|
||||
T.pixel_y = 0
|
||||
T.layer = ABOVE_OBJ_LAYER
|
||||
moved_event.register(T, src, /atom/movable/proc/move_to_turf)
|
||||
moved_event.register(src, T, /atom/movable/proc/move_to_turf)
|
||||
T.stake = src
|
||||
pinned_target = T
|
||||
else
|
||||
density = TRUE
|
||||
if(pinned_target)
|
||||
pinned_target.density = FALSE
|
||||
pinned_target.layer = OBJ_LAYER
|
||||
moved_event.unregister(pinned_target, src)
|
||||
moved_event.unregister(src, pinned_target)
|
||||
pinned_target.stake = null
|
||||
pinned_target = null
|
||||
|
||||
pinned_target.forceMove(user.loc)
|
||||
if(ishuman(user))
|
||||
if(!user.get_active_hand())
|
||||
user.put_in_hands(pinned_target)
|
||||
to_chat(user, "You take the target out of the stake.")
|
||||
else
|
||||
pinned_target.forceMove(get_turf(user))
|
||||
to_chat(user, "You take the target out of the stake.")
|
||||
|
||||
pinned_target = null
|
||||
/obj/structure/target_stake/Destroy()
|
||||
set_target(null)
|
||||
return ..()
|
||||
@@ -132,6 +132,7 @@
|
||||
matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50)
|
||||
recyclable = TRUE
|
||||
w_class = ITEMSIZE_TINY
|
||||
flags = NOBLUDGEON
|
||||
var/datum/weakref/thrall = null
|
||||
var/time_counter = 0
|
||||
var/closed = FALSE
|
||||
@@ -205,7 +206,6 @@
|
||||
var/thrall_response = alert(H, "Do you believe in hypnosis?", "Willpower", "Yes", "No")
|
||||
if(thrall_response == "Yes")
|
||||
to_chat(H, "<span class='notice'><i>... [text] ...</i></span>")
|
||||
H.cure_all_traumas(cure_type = CURE_HYPNOSIS)
|
||||
else
|
||||
thrall = null
|
||||
|
||||
@@ -290,8 +290,7 @@
|
||||
ticktock = "Tick"
|
||||
to_chat(H, "<span class='notice'><i>[ticktock]. . .</i></span>")
|
||||
sound_to(H, 'sound/effects/singlebeat.ogg')
|
||||
if(prob(1))
|
||||
H.cure_all_traumas(cure_type = CURE_SOLITUDE)
|
||||
|
||||
|
||||
/obj/machinery/chakrapod
|
||||
name = "Crystal Therapy Pod"
|
||||
@@ -635,20 +634,13 @@
|
||||
break
|
||||
|
||||
var/obj/item/organ/internal/brain/sponge = H.internal_organs_by_name[BP_BRAIN]
|
||||
if (!istype(sponge) || !sponge.traumas.len)
|
||||
if (!istype(sponge))
|
||||
if(get_dist(user,src) <= 1)
|
||||
to_chat(user, "<span class='danger'>Error: Subject not recognized. Terminating operation.</span>")
|
||||
playsound(src, 'sound/machines/buzz-two.ogg', 50, 1)
|
||||
visible_message("<span class='warning'>[connected] buzzes harshly.</span>", "<span class='warning'>You hear a sharp buzz.</span>")
|
||||
break
|
||||
|
||||
for(var/X in sponge.traumas)
|
||||
var/datum/brain_trauma/trauma = X
|
||||
if(trauma.cure_type == CURE_CRYSTAL)
|
||||
if(!trauma.permanent)
|
||||
qdel(trauma)
|
||||
electroshock_trauma = 1
|
||||
break
|
||||
|
||||
if(electroshock_trauma)
|
||||
visible_message("<span class='notice'>[connected] pings cheerfully.</span>", "<span class='notice'>You hear a ping.</span>")
|
||||
|
||||
@@ -155,6 +155,7 @@
|
||||
/obj/item/clothing/gloves/latex = 2,
|
||||
/obj/item/clothing/head/welding = 2,
|
||||
/obj/item/clothing/mask/gas/alt = 2,
|
||||
/obj/item/clothing/mask/gas/half = 2,
|
||||
/obj/item/clothing/shoes/galoshes = 2,
|
||||
/obj/item/clothing/under/pants/camo = 2,
|
||||
/obj/item/clothing/under/syndicate/tacticool = 2,
|
||||
|
||||
@@ -459,8 +459,6 @@
|
||||
|
||||
// Filling/emptying open reagent containers
|
||||
var/obj/item/reagent_containers/RG = O
|
||||
if (istype(RG, /obj/item/reagent_containers/glass/rag))
|
||||
return
|
||||
|
||||
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")
|
||||
@@ -534,7 +532,7 @@
|
||||
// Short of a rewrite, this is necessary to stop monkeycubes being washed.
|
||||
else if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
|
||||
return
|
||||
else if(istype(O, /obj/item/mop) || istype(O, /obj/item/reagent_containers/glass/rag))
|
||||
else if(istype(O, /obj/item/mop))
|
||||
O.reagents.add_reagent(/decl/reagent/water, 5)
|
||||
to_chat(user, SPAN_NOTICE("You wet \the [O] in \the [src]."))
|
||||
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
|
||||
|
||||
Reference in New Issue
Block a user