cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 11:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/machinery/portable_turret.dm
This commit is contained in:
mwerezak
2014-12-03 23:37:02 -05:00
parent 01fbe4b542 5fc6518e21
commit 77288fb951
170 changed files with 8737 additions and 8416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/datumvars.dm
+2 -2
View File
@@ -670,8 +670,8 @@ client
return
switch(href_list["rotatedir"])
if("right") A.dir = turn(A.dir, -45)
if("left") A.dir = turn(A.dir, 45)
if("right") A.set_dir(turn(A.dir, -45))
if("left") A.set_dir(turn(A.dir, 45))
href_list["datumrefresh"] = href_list["rotatedatum"]
else if(href_list["makemonkey"])
code/datums/spells/dumbfire.dm
+1 -1
View File
@@ -43,7 +43,7 @@
projectile:linked_spells += proj_type
projectile.icon = proj_icon
projectile.icon_state = proj_icon_state
projectile.dir = get_dir(projectile, target)
projectile.set_dir(get_dir(projectile, target))
projectile.name = proj_name
var/current_loc = usr.loc
code/datums/spells/projectile.dm
+2 -2
View File
@@ -34,7 +34,7 @@
projectile:linked_spells += proj_type
projectile.icon = proj_icon
projectile.icon_state = proj_icon_state
projectile.dir = get_dir(target,projectile)
projectile.set_dir(get_dir(target,projectile))
projectile.name = proj_name
var/current_loc = usr.loc
@@ -47,7 +47,7 @@
if(proj_homing)
if(proj_insubstantial)
projectile.dir = get_dir(projectile,target)
projectile.set_dir(get_dir(projectile,target))
projectile.loc = get_step_to(projectile,target)
else
step_to(projectile,target)
code/datums/supplypacks.dm
+10
View File
@@ -380,6 +380,16 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containername = "Medical crate"
group = "Medical"
/datum/supply_packs/medical
name = "BloodPack crate"
contains = list(/obj/item/weapon/storage/box/bloodpacks,
/obj/item/weapon/storage/box/bloodpacks,
/obj/item/weapon/storage/box/bloodpacks)
cost = 10
containertype = /obj/structure/closet/crate/medical
containername = "BloodPack crate"
group = "Medical"
/datum/supply_packs/bodybag
name = "Body bag crate"
contains = list(/obj/item/weapon/storage/box/bodybags,