April sync (#360)

* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
This commit is contained in:
Poojawa
2017-04-13 23:37:00 -05:00
committed by GitHub
parent cdc32c98fa
commit 7e9b96a00f
1322 changed files with 174827 additions and 23888 deletions
+8 -40
View File
@@ -76,11 +76,14 @@
/turf/open/space/attack_paw(mob/user)
return src.attack_hand(user)
/turf/open/space/attackby(obj/item/C, mob/user, params, area/area_restriction)
/turf/open/space/proc/CanBuildHere()
return TRUE
/turf/open/space/attackby(obj/item/C, mob/user, params)
..()
if(!CanBuildHere())
return
if(istype(C, /obj/item/stack/rods))
if(istype(area_restriction) && !istype(get_area(src), area_restriction))
return
var/obj/item/stack/rods/R = C
var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
var/obj/structure/lattice/catwalk/W = locate(/obj/structure/lattice/catwalk, src)
@@ -136,43 +139,6 @@
stoplag()//Let a diagonal move finish, if necessary
A.newtonian_move(A.inertia_dir)
/turf/open/space/proc/Sandbox_Spacemove(atom/movable/A)
var/cur_x
var/cur_y
var/next_x = src.x
var/next_y = src.y
var/target_z
var/list/y_arr
var/list/cur_pos = src.get_global_map_pos()
if(!cur_pos)
return
cur_x = cur_pos["x"]
cur_y = cur_pos["y"]
if(src.x <= 1)
next_x = (--cur_x||global_map.len)
y_arr = global_map[next_x]
target_z = y_arr[cur_y]
next_x = world.maxx - 2
else if (src.x >= world.maxx)
next_x = (++cur_x > global_map.len ? 1 : cur_x)
y_arr = global_map[next_x]
target_z = y_arr[cur_y]
next_x = 3
else if (src.y <= 1)
y_arr = global_map[cur_x]
next_y = (--cur_y||y_arr.len)
target_z = y_arr[next_y]
next_y = world.maxy - 2
else if (src.y >= world.maxy)
y_arr = global_map[cur_x]
next_y = (++cur_y > y_arr.len ? 1 : cur_y)
target_z = y_arr[next_y]
next_y = 3
var/turf/T = locate(next_x, next_y, target_z)
A.Move(T)
/turf/open/space/handle_slip()
return
@@ -194,6 +160,8 @@
/turf/open/space/rcd_vals(mob/user, obj/item/weapon/rcd/the_rcd)
if(!CanBuildHere())
return FALSE
switch(the_rcd.mode)
if(RCD_FLOORWALL)
return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 2)
+3 -4
View File
@@ -58,9 +58,8 @@
AM.loc = T
AM.newtonian_move(dir)
//Overwrite because we dont want people building rods
/turf/open/space/transit/attackby(obj/item/C, mob/user, params)
..(C, user, params, /area/shuttle)
/turf/open/space/transit/CanBuildHere()
return istype(get_area(src), /area/shuttle)
/turf/open/space/transit/Initialize()
..()
@@ -90,4 +89,4 @@
state = ((p*x+y) % 15) + 1
icon_state = "speedspace_ns_[state]"
transform = turn(matrix(), angle)
transform = turn(matrix(), angle)