cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup

Browse Source
This commit is contained in:
Iamgoofball
2015-01-16 17:25:50 -08:00
parent f3398e58a9 c08e4e4332
commit 38070820f3
130 changed files with 2634 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+3 -3
View File
@@ -83,7 +83,7 @@
new /obj/item/weapon/shield/riot/tele(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/gun/advtaser(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/weapon/storage/belt/security/full(src)
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
return
@@ -113,7 +113,7 @@
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/gun/advtaser(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/weapon/storage/belt/security/full(src)
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
return
@@ -137,7 +137,7 @@
new /obj/item/weapon/reagent_containers/spray/pepper(src)
new /obj/item/device/flash/handheld(src)
new /obj/item/weapon/grenade/flashbang(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/weapon/storage/belt/security/full(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/suit/toggle/wintercoat/security(src)
return
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+30
View File
@@ -5,6 +5,36 @@
icon_closed = "syndicate"
icon_opened = "syndicateopen"
/obj/structure/closet/syndicate/ertCom/New()
name = "commanders closet"
desc = "Emergency Response Team equipment locker"
new /obj/item/weapon/card/id/ertsCommand(src)
new /obj/item/weapon/storage/backpack/security(src)
return
/obj/structure/closet/syndicate/ertSec/New()
name = "security closet"
desc = "Emergency Response Team equipment locker"
new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
new /obj/item/weapon/card/id/ertsSecurity(src)
new /obj/item/weapon/storage/backpack/security(src)
return
/obj/structure/closet/syndicate/ertMed/New()
name = "medical closet"
desc = "Emergency Response Team equipment locker"
new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
new /obj/item/weapon/card/id/ertsMedical(src)
new /obj/item/weapon/storage/backpack/medic(src)
return
/obj/structure/closet/syndicate/ertEngi/New()
name = "engineer closet"
desc = "Emergency Response Team equipment locker"
new /obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol(src)
new /obj/item/weapon/card/id/ertsEngineer(src)
new /obj/item/weapon/storage/backpack/industrial(src)
return
/obj/structure/closet/syndicate/personal
desc = "It's a personal storage unit for operative gear."
code/game/objects/structures/window.dm
+1
View File
@@ -112,6 +112,7 @@
update_nearby_icons()
/obj/structure/window/attack_tk(mob/user as mob)
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message("<span class='notice'>Something knocks on [src].</span>")
add_fingerprint(user)
playsound(loc, 'sound/effects/Glassknock.ogg', 50, 1)