cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-22 05:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
This commit is contained in:
paprka
2014-12-27 22:26:21 -08:00
parent 0e4903bd83 5074b76a1e
commit 79e2eedacb
105 changed files with 1280 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+1 -1
View File
@@ -68,7 +68,7 @@
..()
new /obj/item/clothing/under/rank/janitor(src)
new /obj/item/weapon/cartridge/janitor(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/head/soft/purple(src)
new /obj/item/device/flashlight(src)
new /obj/item/weapon/caution(src)
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+3 -3
View File
@@ -20,7 +20,7 @@
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/yellow(src)
new /obj/item/clothing/gloves/color/yellow(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/weapon/cartridge/ce(src)
new /obj/item/device/radio/headset/heads/ce(src)
@@ -46,8 +46,8 @@
/obj/structure/closet/secure_closet/engineering_electrical/New()
..()
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/color/yellow(src)
new /obj/item/clothing/gloves/color/yellow(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)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+2 -2
View File
@@ -69,7 +69,7 @@
new /obj/item/clothing/suit/toggle/labcoat(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/device/radio/headset/headset_med(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/weapon/defibrillator/loaded(src)
new /obj/item/weapon/storage/belt/medical(src)
new /obj/item/clothing/glasses/hud/health(src)
@@ -101,7 +101,7 @@
new /obj/item/clothing/shoes/sneakers/brown (src)
new /obj/item/weapon/cartridge/cmo(src)
new /obj/item/device/radio/headset/heads/cmo(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/weapon/defibrillator/loaded(src)
new /obj/item/weapon/storage/belt/medical(src)
new /obj/item/device/flash/handheld(src)
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1 -1
View File
@@ -42,7 +42,7 @@
new /obj/item/clothing/under/rank/research_director/turtleneck(src)
new /obj/item/weapon/cartridge/rd(src)
new /obj/item/clothing/shoes/sneakers/white(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/device/radio/headset/heads/rd(src)
new /obj/item/weapon/tank/air(src)
new /obj/item/clothing/mask/gas(src)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+2 -2
View File
@@ -22,7 +22,7 @@
new /obj/item/weapon/cartridge/captain(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/device/radio/headset/heads/captain/alt(src)
new /obj/item/clothing/gloves/captain(src)
new /obj/item/clothing/gloves/color/captain(src)
new /obj/item/clothing/suit/toggle/wintercoat/captain(src)
new /obj/item/clothing/head/santa(src)
new /obj/item/weapon/gun/energy/gun(src)
@@ -198,7 +198,7 @@
new /obj/item/clothing/under/rank/det(src)
new /obj/item/clothing/suit/det_suit(src)
new /obj/item/clothing/head/det_hat(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/clothing/under/rank/det/grey(src)
new /obj/item/clothing/suit/det_suit/grey(src)
new /obj/item/clothing/head/fedora(src)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+2 -3
View File
@@ -12,10 +12,9 @@
/obj/structure/closet/syndicate/personal/New()
..()
new /obj/item/clothing/under/syndicate(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet/swat/syndicate(src)
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/device/radio/headset/syndicate(src)
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/weapon/storage/belt/military(src)
new /obj/item/weapon/crowbar/red(src)
new /obj/item/clothing/glasses/night(src)
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+1 -1
View File
@@ -132,7 +132,7 @@
if(prob(20))
new /obj/item/device/multitool(src)
if(prob(5))
new /obj/item/clothing/gloves/yellow(src)
new /obj/item/clothing/gloves/color/yellow(src)
if(prob(40))
new /obj/item/clothing/head/hardhat(src)
code/game/objects/structures/watercloset.dm
+22 -17
View File
@@ -18,8 +18,10 @@
/obj/structure/toilet/attack_hand(mob/living/user)
if(swirlie)
user.visible_message("<span class='danger'>[user] slams the toilet seat onto [swirlie]'s head!</span>", "<span class='notice'>You slam the toilet seat onto [swirlie]'s head!</span>", "You hear reverberating porcelain.")
swirlie.adjustBruteLoss(8)
user.changeNext_move(CLICK_CD_MELEE)
playsound(src.loc, "swing_hit", 25, 1)
swirlie.visible_message("<span class='danger'>[user] slams the toilet seat onto [swirlie]'s head!</span>", "<span class='userdanger'>[user] slams the toilet seat onto [swirlie]'s head!</span>", "You hear reverberating porcelain.")
swirlie.adjustBruteLoss(5)
return
if(cistern && !open)
@@ -55,6 +57,7 @@
return
if(istype(I, /obj/item/weapon/grab))
user.changeNext_move(CLICK_CD_MELEE)
var/obj/item/weapon/grab/G = I
if(!G.confirm())
return
@@ -64,21 +67,23 @@
if(GM.loc != get_turf(src))
user << "<span class='notice'>[GM] needs to be on [src].</span>"
return
if(open && !swirlie)
user.visible_message("<span class='danger'>[user] starts to give [GM] a swirlie!</span>", "<span class='notice'>You start to give [GM] a swirlie!</span>")
swirlie = GM
if(do_after(user, 30, 5, 0))
user.visible_message("<span class='danger'>[user] gives [GM] a swirlie!</span>", "<span class='notice'>You give [GM] a swirlie!</span>", "You hear a toilet flushing.")
if(iscarbon(GM))
var/mob/living/carbon/C = GM
if(!C.internal)
C.adjustOxyLoss(5)
else
GM.adjustOxyLoss(5)
swirlie = null
else
user.visible_message("<span class='danger'>[user] slams [GM.name] into [src]!</span>", "<span class='notice'>You slam [GM] into [src]!</span>")
GM.adjustBruteLoss(8)
if(!swirlie)
if(open)
GM.visible_message("<span class='danger'>[user] starts to give [GM] a swirlie!</span>", "<span class='userdanger'>[user] starts to give [GM] a swirlie!</span>")
swirlie = GM
if(do_after(user, 30, 5, 0))
GM.visible_message("<span class='danger'>[user] gives [GM] a swirlie!</span>", "<span class='userdanger'>[user] gives [GM] a swirlie!</span>", "You hear a toilet flushing.")
if(iscarbon(GM))
var/mob/living/carbon/C = GM
if(!C.internal)
C.adjustOxyLoss(5)
else
GM.adjustOxyLoss(5)
swirlie = null
else
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
GM.visible_message("<span class='danger'>[user] slams [GM.name] into [src]!</span>", "<span class='userdanger'>[user] slams [GM.name] into [src]!</span>")
GM.adjustBruteLoss(5)
else
user << "<span class='notice'>You need a tighter grip.</span>"