cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into supply

Browse Source
This commit is contained in:
GinjaNinja32
2015-02-03 17:22:10 +00:00
parent 444c7c71f3 72d04a0169
commit 05532fd330
191 changed files with 1774 additions and 22146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/spells/area_teleport.dm
View File

@@ -47,7 +47,7 @@
return
if(target && target.buckled)
target.buckled.unbuckle()
target.buckled.unbuckle_mob()
var/list/tempL = L
var/attempt = null

2
code/datums/spells/ethereal_jaunt.dm
View File

@@ -20,7 +20,7 @@
if(target.buckled)
var/obj/structure/stool/bed/buckled_to = target.buckled.
buckled_to.unbuckle()
buckled_to.unbuckle_mob()
var/mobloc = get_turf(target.loc)
var/obj/effect/dummy/spell_jaunt/holder = new /obj/effect/dummy/spell_jaunt( mobloc )

7
code/datums/supplypacks.dm
View File

@@ -955,8 +955,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
name = "Sterile equipment crate"
contains = list(/obj/item/clothing/under/rank/medical/green,
/obj/item/clothing/under/rank/medical/green,
/obj/item/clothing/head/surgery/green,
/obj/item/clothing/head/surgery/green,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves)
/obj/item/weapon/storage/box/gloves,
/obj/item/weapon/storage/belt/medical,
/obj/item/weapon/storage/belt/medical,
/obj/item/weapon/storage/belt/medical)
cost = 15
containertype = "/obj/structure/closet/crate"
containername = "Sterile equipment crate"