Bleeding edgy refresh (#303)

* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
+38 -12
View File
@@ -14,6 +14,8 @@
var/global/datum/gas_mixture/space/space_gas = new
plane = PLANE_SPACE
light_power = 0.25
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/turf/open/space/Initialize()
icon_state = SPACE_ICON_STATE
@@ -23,9 +25,19 @@
stack_trace("Warning: [src]([type]) initialized multiple times!")
initialized = TRUE
var/area/A = loc
if(!IS_DYNAMIC_LIGHTING(src) && IS_DYNAMIC_LIGHTING(A))
add_overlay(/obj/effect/fullbright)
if(requires_activation)
SSair.add_to_active(src)
if (light_power && light_range)
update_light()
if (opacity)
has_opaque_atom = TRUE
/turf/open/space/attack_ghost(mob/dead/observer/user)
if(destination_z)
var/turf/T = locate(destination_x, destination_y, destination_z)
@@ -52,15 +64,14 @@
if(isspaceturf(t))
//let's NOT update this that much pls
continue
SetLuminosity(4,5)
light.mode = LIGHTING_STARLIGHT
set_light(2)
return
SetLuminosity(0)
set_light(0)
/turf/open/space/attack_paw(mob/user)
return src.attack_hand(user)
/turf/open/space/attackby(obj/item/C, mob/user, area/area_restriction)
/turf/open/space/attackby(obj/item/C, mob/user, params, area/area_restriction)
..()
if(istype(C, /obj/item/stack/rods))
if(istype(area_restriction) && !istype(get_area(src), area_restriction))
@@ -69,22 +80,22 @@
var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
var/obj/structure/lattice/catwalk/W = locate(/obj/structure/lattice/catwalk, src)
if(W)
user << "<span class='warning'>There is already a catwalk here!</span>"
to_chat(user, "<span class='warning'>There is already a catwalk here!</span>")
return
if(L)
if(R.use(1))
user << "<span class='notice'>You construct a catwalk.</span>"
to_chat(user, "<span class='notice'>You construct a catwalk.</span>")
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
new/obj/structure/lattice/catwalk(src)
else
user << "<span class='warning'>You need two rods to build a catwalk!</span>"
to_chat(user, "<span class='warning'>You need two rods to build a catwalk!</span>")
return
if(R.use(1))
user << "<span class='notice'>You construct a lattice.</span>"
to_chat(user, "<span class='notice'>You construct a lattice.</span>")
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
ReplaceWithLattice()
else
user << "<span class='warning'>You need one rod to build a lattice.</span>"
to_chat(user, "<span class='warning'>You need one rod to build a lattice.</span>")
return
if(istype(C, /obj/item/stack/tile/plasteel))
var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
@@ -93,12 +104,12 @@
if(S.use(1))
qdel(L)
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
user << "<span class='notice'>You build a floor.</span>"
to_chat(user, "<span class='notice'>You build a floor.</span>")
ChangeTurf(/turf/open/floor/plating)
else
user << "<span class='warning'>You need one floor tile to build a floor!</span>"
to_chat(user, "<span class='warning'>You need one floor tile to build a floor!</span>")
else
user << "<span class='warning'>The plating is going to need some support! Place metal rods first.</span>"
to_chat(user, "<span class='warning'>The plating is going to need some support! Place metal rods first.</span>")
/turf/open/space/Entered(atom/movable/A)
..()
@@ -175,3 +186,18 @@
/turf/open/space/acid_act(acidpwr, acid_volume)
return 0
/turf/open/space/rcd_vals(mob/user, obj/item/weapon/rcd/the_rcd)
switch(the_rcd.mode)
if(RCD_FLOORWALL)
return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 2)
return FALSE
/turf/open/space/rcd_act(mob/user, obj/item/weapon/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_FLOORWALL)
to_chat(user, "<span class='notice'>You build a floor.</span>")
ChangeTurf(/turf/open/floor/plating)
return TRUE
return FALSE
+5 -8
View File
@@ -30,8 +30,9 @@
var/list/possible_transtitons = list()
var/k = 1
for(var/a in map_transition_config)
if(map_transition_config[a] == CROSSLINKED) // Only pick z-levels connected to station space
var/list/config_list = SSmapping.config.transition_config
for(var/a in config_list)
if(config_list[a] == CROSSLINKED) // Only pick z-levels connected to station space
possible_transtitons += k
k++
var/_z = pick(possible_transtitons)
@@ -58,8 +59,8 @@
AM.newtonian_move(dir)
//Overwrite because we dont want people building rods
/turf/open/space/transit/attackby(obj/item/C, mob/user)
..(C, user, /area/shuttle)
/turf/open/space/transit/attackby(obj/item/C, mob/user, params)
..(C, user, params, /area/shuttle)
/turf/open/space/transit/Initialize()
..()
@@ -80,8 +81,6 @@
if(EAST)
angle = 90
state = ((x+p*y) % 15) + 1
if(state < 1)
state += 15
if(WEST)
angle = -90
state = ((x-p*y) % 15) + 1
@@ -89,8 +88,6 @@
state += 15
else
state = ((p*x+y) % 15) + 1
if(state < 1)
state += 15
icon_state = "speedspace_ns_[state]"
transform = turn(matrix(), angle)