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

Merge branch 'master' into upstream-merge-32188

Browse Source
This commit is contained in:
deathride58
2017-11-21 19:53:58 +00:00
committed by GitHub
parent eeba86e27e 03d67c753e
commit 1f6b3ce629
285 changed files with 56239 additions and 56588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/chasm.dm
+1 -1
View File
@@ -11,7 +11,7 @@
canSmoothWith = list(/turf/open/floor/fakepit, /turf/open/chasm)
density = TRUE //This will prevent hostile mobs from pathing into chasms, while the canpass override will still let it function like an open turf
var/static/list/falling_atoms = list() //Atoms currently falling into the chasm
var/static/list/forbidden_types = typecacheof(list(/obj/effect/portal, /obj/singularity, /obj/structure/stone_tile, /obj/item/projectile, /obj/effect/abstract, /obj/effect/temp_visual))
var/static/list/forbidden_types = typecacheof(list(/obj/effect/portal, /obj/singularity, /obj/structure/stone_tile, /obj/item/projectile, /obj/effect/abstract, /obj/effect/temp_visual, /obj/effect/light_emitter/tendril, /obj/effect/collapse))
var/drop_x = 1
var/drop_y = 1
var/drop_z = 1
code/game/turfs/simulated/floor/plasteel_floor.dm
+20 -39
View File
@@ -19,22 +19,22 @@
initial_gas_mix = "TEMP=2.7"
/turf/open/floor/plasteel/black
icon_state = "dark"
/turf/open/floor/plasteel/black/telecomms
/turf/open/floor/plasteel/dark
icon_state = "darkfull"
/turf/open/floor/plasteel/dark/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/black/telecomms/mainframe
/turf/open/floor/plasteel/dark/telecomms/mainframe
name = "Mainframe Floor"
/turf/open/floor/plasteel/black/telecomms/server
/turf/open/floor/plasteel/dark/telecomms/server
name = "Server Base"
/turf/open/floor/plasteel/black/telecomms/server/walkway
/turf/open/floor/plasteel/dark/telecomms/server/walkway
name = "Server Walkway"
/turf/open/floor/plasteel/airless/black
/turf/open/floor/plasteel/airless/dark
icon_state = "darkfull"
/turf/open/floor/plasteel/dark/side
icon_state = "dark"
/turf/open/floor/plasteel/black/side
icon_state = "black" //NOTICE ME SEMPAI: floors.dmi contains two sprites named black, remove the incorrect one
/turf/open/floor/plasteel/black/corner
icon_state = "blackcorner"
/turf/open/floor/plasteel/dark/corner
icon_state = "darkcorner"
@@ -224,20 +224,16 @@
/turf/open/floor/plasteel/arrival/corner
icon_state = "arrivalcorner"
/turf/open/floor/plasteel/caution
icon_state = "caution"
/turf/open/floor/plasteel/caution/corner
icon_state = "cautioncorner"
/turf/open/floor/plasteel/escape
icon_state = "escape"
/turf/open/floor/plasteel/escape/corner
icon_state = "escapecorner"
/turf/open/floor/plasteel/whitebot
icon_state = "whitebot"
/turf/open/floor/plasteel/whitebot/delivery
icon_state = "whitedelivery"
/turf/open/floor/plasteel/caution
icon_state = "caution"
/turf/open/floor/plasteel/caution/corner
icon_state = "cautioncorner"
/turf/open/floor/plasteel/redyellow
@@ -284,19 +280,6 @@
icon_state = "yellowcornersiding"
/turf/open/floor/plasteel/podhatch
icon_state = "podhatch"
/turf/open/floor/plasteel/podhatch/corner
icon_state = "podhatchcorner"
/turf/open/floor/plasteel/loadingarea
icon_state = "loadingarea"
/turf/open/floor/plasteel/loadingarea/dirty
icon_state = "loadingareadirty1"
/turf/open/floor/plasteel/loadingarea/dirtydirty
icon_state = "loadingareadirty2"
/turf/open/floor/plasteel/asteroid
icon_state = "asteroidfloor"
/turf/open/floor/plasteel/airless/asteroid
@@ -333,12 +316,6 @@
/turf/open/floor/plasteel/hydrofloor
icon_state = "hydrofloor"
/turf/open/floor/plasteel/delivery
icon_state = "delivery"
/turf/open/floor/plasteel/bot
icon_state = "bot"
/turf/open/floor/plasteel/freezer
icon_state = "freezerfloor"
@@ -358,7 +335,11 @@
icon_state = "cafeteria"
/turf/open/floor/plasteel/vault
icon_state = "vaultfull"
/turf/open/floor/plasteel/vault/side
icon_state = "vault"
/turf/open/floor/plasteel/vault/corner
icon_state = "vaultcorner"
/turf/open/floor/plasteel/vault/telecomms
initial_gas_mix = "n2=100;TEMP=80"
/turf/open/floor/plasteel/vault/telecomms/mainframe
code/game/turfs/simulated/wall/mineral_walls.dm
-4
View File
@@ -13,8 +13,6 @@
icon = 'icons/turf/walls/gold_wall.dmi'
icon_state = "gold"
sheet_type = /obj/item/stack/sheet/mineral/gold
//var/electro = 1
//var/shocked = null
explosion_block = 0 //gold is a soft metal you dingus.
canSmoothWith = list(/turf/closed/wall/mineral/gold, /obj/structure/falsewall/gold)
@@ -24,8 +22,6 @@
icon = 'icons/turf/walls/silver_wall.dmi'
icon_state = "silver"
sheet_type = /obj/item/stack/sheet/mineral/silver
//var/electro = 0.75
//var/shocked = null
canSmoothWith = list(/turf/closed/wall/mineral/silver, /obj/structure/falsewall/silver)
/turf/closed/wall/mineral/diamond