shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "12/21 modernizations from TG live"

Browse Source
This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+2 -3
View File
@@ -2,9 +2,8 @@
name = "booze storage"
req_access = list(access_bar)
icon_state = "cabinet"
resistance_flags = FLAMMABLE
obj_integrity = 70
max_integrity = 70
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/secure_closet/bar/New()
..()
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/quartermaster/New()
..()
new /obj/item/clothing/neck/cloak/qm(src)
new /obj/item/clothing/suit/cloak/qm(src)
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/device/radio/headset/headset_cargo(src)
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+3 -2
View File
@@ -5,18 +5,19 @@
/obj/structure/closet/secure_closet/engineering_chief/New()
..()
new /obj/item/clothing/neck/cloak/ce(src)
new /obj/item/clothing/suit/cloak/ce(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/gloves/color/yellow(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/weapon/tank/jetpack/suit(src)
new /obj/item/hardsuit_jetpack(src)
new /obj/item/weapon/cartridge/ce(src)
new /obj/item/device/radio/headset/heads/ce(src)
new /obj/item/weapon/storage/toolbox/mechanical(src)
new /obj/item/clothing/suit/hazardvest(src)
new /obj/item/device/megaphone/command(src)
new /obj/item/weapon/storage/box/permits(src)
new /obj/item/areaeditor/blueprints(src)
new /obj/item/weapon/airlock_painter(src)
new /obj/item/weapon/holosign_creator/engineering(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1 -1
View File
@@ -54,7 +54,7 @@
/obj/structure/closet/secure_closet/CMO/New()
..()
new /obj/item/clothing/neck/cloak/cmo(src)
new /obj/item/clothing/suit/cloak/cmo(src)
new /obj/item/weapon/storage/backpack/dufflebag/med(src)
new /obj/item/clothing/suit/bio_suit/cmo(src)
new /obj/item/clothing/head/bio_hood/cmo(src)
code/game/objects/structures/crates_lockers/closets/secure/misc.dm
+2 -2
View File
@@ -13,11 +13,11 @@
if(prob(50))
new /obj/item/ammo_box/magazine/m50(src)
new /obj/item/ammo_box/magazine/m50(src)
new /obj/item/weapon/gun/ballistic/automatic/pistol/deagle(src)
new /obj/item/weapon/gun/projectile/automatic/pistol/deagle(src)
else
new /obj/item/ammo_box/a357(src)
new /obj/item/ammo_box/a357(src)
new /obj/item/weapon/gun/ballistic/revolver/mateba(src)
new /obj/item/weapon/gun/projectile/revolver/mateba(src)
/obj/structure/closet/secure_closet/ertSec
name = "security closet"
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+22 -6
View File
@@ -11,7 +11,7 @@
if(prob(50))
new /obj/item/weapon/storage/backpack(src)
else
new /obj/item/weapon/storage/backpack/satchel(src)
new /obj/item/weapon/storage/backpack/satchel_norm(src)
new /obj/item/device/radio/headset( src )
/obj/structure/closet/secure_closet/personal/patient
@@ -25,14 +25,13 @@
/obj/structure/closet/secure_closet/personal/cabinet
icon_state = "cabinet"
resistance_flags = FLAMMABLE
obj_integrity = 70
max_integrity = 70
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/secure_closet/personal/cabinet/New()
..()
contents = list()
new /obj/item/weapon/storage/backpack/satchel/leather/withwallet( src )
new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
new /obj/item/device/radio/headset( src )
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
@@ -54,4 +53,21 @@
else
user << "<span class='danger'>Access Denied.</span>"
else
return ..()
return ..()
/obj/structure/closet/secure_closet/personal/verb/verb_resetlock()//personal locker ownership reset.
set src in oview(1)
set category = "Object"
set name = "Reset Lock"
if(opened)
if(broken)
usr << "<span class='danger'>The lock appears to be broken.</span>"
return
else
registered_name = null
usr << "<span class='danger'>You successfully reset the lock.</span>"
desc = initial(desc)
add_fingerprint(usr)
else
usr << "<span class='danger'>\the [src.name] must be open!</span>"
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+2 -3
View File
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/RD/New()
..()
new /obj/item/clothing/neck/cloak/rd(src)
new /obj/item/clothing/suit/cloak/rd(src)
new /obj/item/clothing/suit/bio_suit/scientist(src)
new /obj/item/clothing/head/bio_hood/scientist(src)
new /obj/item/clothing/suit/toggle/labcoat(src)
@@ -22,5 +22,4 @@
new /obj/item/clothing/suit/armor/reactive/teleport(src)
new /obj/item/device/assembly/flash/handheld(src)
new /obj/item/device/laser_pointer(src)
new /obj/item/weapon/door_remote/research_director(src)
new /obj/item/weapon/storage/box/firingpins(src)
new /obj/item/weapon/door_remote/research_director(src)
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+1 -8
View File
@@ -3,12 +3,5 @@
desc = "It's a card-locked storage unit."
locked = 1
icon_state = "secure"
obj_integrity = 250
max_integrity = 250
armor = list(melee = 30, bullet = 50, laser = 50, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
health = 200
secure = 1
/obj/structure/closet/secure_closet/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
if(damage_flag == "melee" && damage_amount < 20)
return 0
. = ..()
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+15 -20
View File
@@ -9,10 +9,9 @@
if(prob(50))
new /obj/item/weapon/storage/backpack/captain(src)
else
new /obj/item/weapon/storage/backpack/satchel/cap(src)
new /obj/item/clothing/neck/cloak/cap(src)
new /obj/item/weapon/storage/backpack/satchel_cap(src)
new /obj/item/clothing/suit/cloak/cap(src)
new /obj/item/weapon/storage/backpack/dufflebag/captain(src)
new /obj/item/clothing/head/crown/fancy(src)
new /obj/item/clothing/suit/captunic(src)
new /obj/item/clothing/under/captainparade(src)
new /obj/item/clothing/head/caphat/parade(src)
@@ -26,8 +25,7 @@
new /obj/item/clothing/glasses/sunglasses/gar/supergar(src)
new /obj/item/clothing/gloves/color/captain(src)
new /obj/item/weapon/restraints/handcuffs/cable/zipties(src)
new /obj/item/weapon/storage/belt/sabre(src)
new /obj/item/weapon/gun/energy/e_gun(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/door_remote/captain(src)
/obj/structure/closet/secure_closet/hop
@@ -49,8 +47,8 @@
new /obj/item/device/assembly/flash/handheld(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/weapon/restraints/handcuffs/cable/zipties(src)
new /obj/item/weapon/gun/energy/e_gun(src)
new /obj/item/clothing/neck/petcollar(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/clothing/tie/petcollar(src)
new /obj/item/weapon/door_remote/civillian(src)
/obj/structure/closet/secure_closet/hos
@@ -60,7 +58,7 @@
/obj/structure/closet/secure_closet/hos/New()
..()
new /obj/item/clothing/neck/cloak/hos(src)
new /obj/item/clothing/suit/cloak/hos(src)
new /obj/item/weapon/cartridge/hos(src)
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/clothing/under/hosparadefem(src)
@@ -78,7 +76,7 @@
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/shield/riot/tele(src)
new /obj/item/weapon/storage/belt/security/full(src)
new /obj/item/weapon/gun/energy/e_gun/hos(src)
new /obj/item/weapon/gun/energy/gun/hos(src)
new /obj/item/device/flashlight/seclite(src)
new /obj/item/weapon/pinpointer(src)
@@ -102,9 +100,8 @@
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/belt/security/full(src)
new /obj/item/device/flashlight/seclite(src)
new /obj/item/clothing/gloves/krav_maga/sec(src)
new /obj/item/clothing/gloves/color/black/krav_maga/sec(src)
new /obj/item/weapon/door_remote/head_of_security(src)
new /obj/item/weapon/gun/ballistic/shotgun/automatic/dual_tube(src)
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
@@ -158,9 +155,8 @@
name = "\proper detective's cabinet"
req_access = list(access_forensics_lockers)
icon_state = "cabinet"
resistance_flags = FLAMMABLE
obj_integrity = 70
max_integrity = 70
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/secure_closet/detective/New()
..()
@@ -176,14 +172,13 @@
new /obj/item/weapon/storage/box/evidence(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/detective_scanner(src)
new /obj/item/device/flashlight/seclite(src)
new /obj/item/weapon/holosign_creator/security(src)
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/clothing/suit/armor/vest/det_suit(src)
new /obj/item/ammo_box/c38(src)
new /obj/item/ammo_box/c38(src)
new /obj/item/weapon/storage/belt/holster(src)
new /obj/item/weapon/gun/ballistic/revolver/detective(src)
new /obj/item/weapon/gun/projectile/revolver/detective(src)
/obj/structure/closet/secure_closet/injection
name = "lethal injections"
@@ -192,7 +187,7 @@
/obj/structure/closet/secure_closet/injection/New()
..()
for(var/i in 1 to 5)
new /obj/item/weapon/reagent_containers/syringe/lethal/execution(src)
new /obj/item/weapon/reagent_containers/syringe/lethal/choral(src)
/obj/structure/closet/secure_closet/brig
name = "brig locker"
@@ -245,7 +240,7 @@
for(var/i in 1 to 3)
new /obj/item/weapon/storage/box/rubbershot(src)
for(var/i in 1 to 3)
new /obj/item/weapon/gun/ballistic/shotgun/riot(src)
new /obj/item/weapon/gun/projectile/shotgun/riot(src)
/obj/structure/closet/secure_closet/armory3
name = "armory energy gun locker"
@@ -257,7 +252,7 @@
new /obj/item/weapon/storage/box/firingpins(src)
new /obj/item/weapon/gun/energy/ionrifle(src)
for(var/i in 1 to 3)
new /obj/item/weapon/gun/energy/e_gun(src)
new /obj/item/weapon/gun/energy/gun(src)
for(var/i in 1 to 3)
new /obj/item/weapon/gun/energy/laser(src)
@@ -268,7 +263,7 @@
/obj/structure/closet/secure_closet/tac/New()
..()
new /obj/item/weapon/gun/ballistic/automatic/wt550(src)
new /obj/item/weapon/gun/projectile/automatic/wt550(src)
new /obj/item/clothing/head/helmet/alt(src)
new /obj/item/clothing/mask/gas/sechailer(src)
new /obj/item/clothing/suit/armor/bulletproof(src)