cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved around some stuff in R&D. (Change by Blaank)

Browse Source 
Donut boxes and paper bins are now put immediately in your hand to prevent weird shit from happening when you're holding them in your hand or a backpack. Also fixed some compile error with the new special rig suits.

Added some new sprites, mostly chopped up and made by me. RESERVED FOR FUTURE SHENANIGANS.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2260 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2011-09-24 04:24:39 +00:00
parent 00d055d7f6
commit 92dbb05fd5
5 changed files with 5541 additions and 5523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/objects/items/food.dm
View File

@@ -74,8 +74,16 @@ MONKEY CUBE BOX
else
if (src.amount >= 1)
src.amount--
new /obj/item/weapon/reagent_containers/food/snacks/donut( src.loc )
usr << "You take a donut out of the box."
var/obj/item/weapon/reagent_containers/food/snacks/donut/D = new /obj/item/weapon/reagent_containers/food/snacks/donut
D.loc = usr.loc
if(ishuman(usr))
if(!usr.get_active_hand())
usr.put_in_hand(D)
usr << "You take a donut out of the box."
else
D.loc = get_turf_loc(src)
usr << "You take a donut out of the box."
src.update()
return

11
code/game/objects/items/weapons/papers_bins.dm
View File

@@ -357,7 +357,16 @@ CLIPBOARDS
else
if (src.amount >= 1)
src.amount--
new /obj/item/weapon/paper( usr.loc )
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper
P.loc = usr.loc
if(ishuman(usr))
if(!usr.get_active_hand())
usr.put_in_hand(P)
usr << "You take a paper out of the bin."
else
P.loc = get_turf_loc(src)
usr << "You take a paper out of the bin."
src.update()
return

2
code/modules/clothing/spacesuits/rig.dm
View File

@@ -46,4 +46,4 @@
desc = "A special suit that protects against hazardous, low pressure battlefield enviroments. Designed to hold larger oxygen tanks and advanced Nanotrasen tools."
protective_temperature = 10000
armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 40, bio = 50, rad = 30)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/satchel,/obj/item/device/t_scanner,/obj/item/weapon/satchel/pickaxe, /obj/item/weapon/rcd)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)