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

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

Browse Source 
Item attack changes
This commit is contained in:
Ergovisavi
2014-03-06 03:17:02 -08:00
parent ac269baacb 37d5917a1d
commit a3ce04c000
122 changed files with 2275 additions and 3985 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/job_closets.dm
+4 -2
View File
@@ -99,5 +99,7 @@
new /obj/item/clothing/suit/lawyer/bluejacket(src)
new /obj/item/clothing/under/lawyer/purpsuit(src)
new /obj/item/clothing/suit/lawyer/purpjacket(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/under/lawyer/blacksuit(src)
new /obj/item/clothing/suit/lawyer/blackjacket(src)
new /obj/item/clothing/shoes/laceup(src)
new /obj/item/clothing/shoes/laceup(src)
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+4
View File
@@ -25,6 +25,8 @@
new /obj/item/device/radio/headset/heads/captain(src)
new /obj/item/clothing/gloves/captain(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/clothing/under/captainformal(src)
new /obj/item/clothing/head/helmet/HoS/dermal(src)
return
@@ -91,6 +93,8 @@
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/clothing/under/hosformalfem(src)
new /obj/item/clothing/under/hosformalmale(src)
return
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+4
View File
@@ -301,6 +301,10 @@
new /obj/item/clothing/head/soft/grey(src)
new /obj/item/clothing/head/soft/grey(src)
new /obj/item/clothing/head/soft/grey(src)
if(prob(40))
new /obj/item/clothing/under/assistantformal(src)
if(prob(40))
new /obj/item/clothing/under/assistantformal(src)
return
code/game/objects/structures/morgue.dm
+1 -5
View File
@@ -10,7 +10,6 @@
* Morgue
*/
/obj/structure/morgue
name = "morgue"
desc = "Used to keep bodies in untill someone fetches them."
@@ -33,7 +32,7 @@
src.icon_state = "morgue2"//default dead no-client mob
var/list/compiled = recursive_mob_check(src)//run through contents
var/list/compiled = recursive_mob_check(src,0,0)//run through contents
if(!length(compiled))//no mobs at all, but objects inside
src.icon_state = "morgue3"
@@ -45,9 +44,6 @@
break
return
/obj/structure/morgue/ex_act(severity)
switch(severity)
if(1.0)