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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Browse Source 
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-10-21 01:25:04 +10:00
parent e1ac37ee90 4a7c435748
commit 01d3e3bf79
77 changed files with 10392 additions and 9860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/defines/obj/weapon.dm
View File

@@ -1633,6 +1633,32 @@
attack_verb = list("attacked", "slashed", "sawed", "cut")
sharp = 1
/obj/item/weapon/bonegel
name = "bone gel"
icon = 'surgery.dmi'
icon_state = "bone-gel"
force = 0
throwforce = 1.0
/obj/item/weapon/FixOVein
name = "FixOVein"
icon = 'surgery.dmi'
icon_state = "fixovein"
force = 0
throwforce = 1.0
origin_tech = "materials=1;biotech=3"
var/usage_amount = 10
/obj/item/weapon/bonesetter
name = "bone setter"
icon = 'surgery.dmi'
icon_state = "bone setter"
force = 8.0
throwforce = 9.0
throw_speed = 3
throw_range = 5
attack_verb = list("attacked", "hit", "bludgeoned")
/obj/item/weapon/syntiflesh
name = "syntiflesh"
desc = "Meat that appears...strange..."

11
code/defines/procs/helpers.dm
View File

@@ -1353,6 +1353,15 @@ proc/is_hot(obj/item/W as obj)
istype(W, /obj/item/weapon/kitchen/utensil/fork) && W.icon_state != "forkloaded" || \
istype(W, /obj/item/weapon/twohanded/fireaxe) \
)
/proc/is_surgery_tool(obj/item/W as obj)
return ( \
istype(W, /obj/item/weapon/scalpel) || \
istype(W, /obj/item/weapon/hemostat) || \
istype(W, /obj/item/weapon/retractor) || \
istype(W, /obj/item/weapon/cautery) || \
istype(W, /obj/item/weapon/bonegel) || \
istype(W, /obj/item/weapon/bonesetter)
)
/proc/reverse_direction(var/dir)
switch(dir)
@@ -1371,4 +1380,4 @@ proc/is_hot(obj/item/W as obj)
if(WEST)
return EAST
if(NORTHWEST)
return SOUTHEAST
return SOUTHEAST