shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bleeding edgy refresh (#303)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/tile_types.dm
+42 -2
View File
@@ -24,11 +24,11 @@
var/obj/item/weapon/weldingtool/WT = W
if(get_amount() < 4)
user << "<span class='warning'>You need at least four tiles to do this!</span>"
to_chat(user, "<span class='warning'>You need at least four tiles to do this!</span>")
return
if(WT.is_hot() && !mineralType)
user << "<span class='warning'>You can not reform this!</span>"
to_chat(user, "<span class='warning'>You can not reform this!</span>")
return
if(WT.remove_fuel(0,user))
@@ -111,6 +111,18 @@
/obj/item/stack/tile/fakespace/loaded
amount = 30
/obj/item/stack/tile/fakepit
name = "fake pits"
singular_name = "fake pit"
desc = "A piece of carpet with a forced perspective illusion of a pit. No way this could fool anyone!"
icon_state = "tile_pit"
turf_type = /turf/open/floor/fakepit
resistance_flags = FLAMMABLE
merge_type = /obj/item/stack/tile/fakepit
/obj/item/stack/tile/fakepit/loaded
amount = 30
//High-traction
/obj/item/stack/tile/noslip
name = "high-traction floor tile"
@@ -124,6 +136,34 @@
/obj/item/stack/tile/noslip/thirty
amount = 30
//Circuit
/obj/item/stack/tile/circuit
name = "blue circuit tile"
singular_name = "blue circuit tile"
desc = "A blue circuit tile."
icon_state = "tile_bcircuit"
turf_type = /turf/open/floor/circuit
/obj/item/stack/tile/circuit/green
name = "green circuit tile"
singular_name = "green circuit tile"
desc = "A green circuit tile."
icon_state = "tile_gcircuit"
turf_type = /turf/open/floor/circuit/green
/obj/item/stack/tile/circuit/green/anim
turf_type = /turf/open/floor/circuit/green/anim
/obj/item/stack/tile/circuit/red
name = "red circuit tile"
singular_name = "red circuit tile"
desc = "A red circuit tile."
icon_state = "tile_rcircuit"
turf_type = /turf/open/floor/circuit/red
/obj/item/stack/tile/circuit/red/anim
turf_type = /turf/open/floor/circuit/red/anim
//Pod floor
/obj/item/stack/tile/pod
name = "pod floor tile"