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

Screw commit history.

Browse Source
This commit is contained in:
Ghommie
2020-02-02 01:26:04 +01:00
parent b1a571bf2d
commit 95db5084ab
267 changed files with 2201 additions and 1848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor/fancy_floor.dm
+52 -12
View File
@@ -214,7 +214,7 @@
floor_tile = /obj/item/stack/tile/carpet
broken_states = list("damaged")
smooth = SMOOTH_TRUE
canSmoothWith = list(/turf/open/floor/carpet)
canSmoothWith = list(/turf/open/floor/carpet, /turf/open/floor/carpet/airless)
flags_1 = NONE
bullet_bounce_sound = null
footstep = FOOTSTEP_CARPET
@@ -245,59 +245,99 @@
/turf/open/floor/carpet/black
icon = 'icons/turf/floors/carpet_black.dmi'
floor_tile = /obj/item/stack/tile/carpet/black
canSmoothWith = list(/turf/open/floor/carpet/black, /turf/open/floor/carpet/blackred, /turf/open/floor/carpet/monochrome)
smooth = SMOOTH_MORE
canSmoothWith = list(/turf/open/floor/carpet/black, /turf/open/floor/carpet/blackred, /turf/open/floor/carpet/monochrome)
/turf/open/floor/carpet/blackred
icon = 'icons/turf/floors/carpet_blackred.dmi'
floor_tile = /obj/item/stack/tile/carpet/blackred
icon_state = "tile-carpet-blackred"
canSmoothWith = list(/turf/open/floor/carpet/black, /turf/open/floor/carpet/blackred, /turf/open/floor/carpet/monochrome)
smooth = SMOOTH_MORE
canSmoothWith = list(/turf/open/floor/carpet/black, /turf/open/floor/carpet/blackred, /turf/open/floor/carpet/monochrome)
/turf/open/floor/carpet/monochrome
icon = 'icons/turf/floors/carpet_monochrome.dmi'
floor_tile = /obj/item/stack/tile/carpet/monochrome
icon_state = "tile-carpet-monochrome"
canSmoothWith = list(/turf/open/floor/carpet/black, /turf/open/floor/carpet/blackred, /turf/open/floor/carpet/monochrome)
smooth = SMOOTH_MORE
canSmoothWith = list(/turf/open/floor/carpet/black, /turf/open/floor/carpet/blackred, /turf/open/floor/carpet/monochrome)
/turf/open/floor/carpet/blue
icon = 'icons/turf/floors/carpet_blue.dmi'
floor_tile = /obj/item/stack/tile/carpet/blue
canSmoothWith = list(/turf/open/floor/carpet/blue)
canSmoothWith = list(/turf/open/floor/carpet/blue, /turf/open/floor/carpet/blue/airless)
/turf/open/floor/carpet/cyan
icon = 'icons/turf/floors/carpet_cyan.dmi'
floor_tile = /obj/item/stack/tile/carpet/cyan
canSmoothWith = list(/turf/open/floor/carpet/cyan)
canSmoothWith = list(/turf/open/floor/carpet/cyan, /turf/open/floor/carpet/cyan/airless)
/turf/open/floor/carpet/green
icon = 'icons/turf/floors/carpet_green.dmi'
floor_tile = /obj/item/stack/tile/carpet/green
canSmoothWith = list(/turf/open/floor/carpet/green)
canSmoothWith = list(/turf/open/floor/carpet/green, /turf/open/floor/carpet/green/airless)
/turf/open/floor/carpet/orange
icon = 'icons/turf/floors/carpet_orange.dmi'
floor_tile = /obj/item/stack/tile/carpet/orange
canSmoothWith = list(/turf/open/floor/carpet/orange)
canSmoothWith = list(/turf/open/floor/carpet/orange, /turf/open/floor/carpet/orange/airless)
/turf/open/floor/carpet/purple
icon = 'icons/turf/floors/carpet_purple.dmi'
floor_tile = /obj/item/stack/tile/carpet/purple
canSmoothWith = list(/turf/open/floor/carpet/purple)
canSmoothWith = list(/turf/open/floor/carpet/purple, /turf/open/floor/carpet/purple/airless)
/turf/open/floor/carpet/red
icon = 'icons/turf/floors/carpet_red.dmi'
floor_tile = /obj/item/stack/tile/carpet/red
canSmoothWith = list(/turf/open/floor/carpet/red)
canSmoothWith = list(/turf/open/floor/carpet/red, /turf/open/floor/carpet/red/airless)
/turf/open/floor/carpet/royalblack
icon = 'icons/turf/floors/carpet_royalblack.dmi'
floor_tile = /obj/item/stack/tile/carpet/royalblack
canSmoothWith = list(/turf/open/floor/carpet/royalblack)
canSmoothWith = list(/turf/open/floor/carpet/royalblack, /turf/open/floor/carpet/royalblack/airless)
/turf/open/floor/carpet/royalblue
icon = 'icons/turf/floors/carpet_royalblue.dmi'
floor_tile = /obj/item/stack/tile/carpet/royalblue
canSmoothWith = list(/turf/open/floor/carpet/royalblue)
canSmoothWith = list(/turf/open/floor/carpet/royalblue, /turf/open/floor/carpet/royalblue/airless)
//*****Airless versions of all of the above.*****
/turf/open/floor/carpet/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/black/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/blackred/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/monochrome/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/blue/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/cyan/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/green/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/orange/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/purple/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/red/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/royalblack/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/royalblue/airless
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/carpet/narsie_act(force, ignore_mobs, probability = 20)
. = (prob(probability) || force)
code/game/turfs/simulated/minerals.dm
+5
View File
@@ -168,6 +168,11 @@
M.levelupdate()
/turf/closed/mineral/random/no_caves
mineralSpawnChanceList = list(/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
/turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40, /turf/closed/mineral/titanium = 11,
/turf/closed/mineral/gibtonite = 4, /turf/closed/mineral/bscrystal = 1)
/turf/closed/mineral/random/high_chance
icon_state = "rock_highchance"
mineralChance = 25