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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

Browse Source
This commit is contained in:
Ghommie
2020-05-30 03:29:02 +02:00
parent a84e7bcecc 668205c149
commit 1bca74465f
322 changed files with 9457 additions and 2425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor/fancy_floor.dm
+1
View File
@@ -11,6 +11,7 @@
desc = "Stylish dark wood."
icon_state = "wood"
floor_tile = /obj/item/stack/tile/wood
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 0.25)
broken_states = list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7")
footstep = FOOTSTEP_WOOD
barefootstep = FOOTSTEP_WOOD_BAREFOOT
code/game/turfs/simulated/floor/plasteel_floor.dm
+92
View File
@@ -146,3 +146,95 @@
/turf/open/floor/plasteel/sepia
icon_state = "sepia"
///////////////////////////////
// Pre-Applied Decal Floors //
//////////////////////////////
// Neutral
/turf/open/floor/plasteel/neutral
icon_state = "neutral_full"
/turf/open/floor/plasteel/neutral/side
icon_state = "neutral"
/turf/open/floor/plasteel/neutral/corner
icon_state = "neutral_corner"
// Dark Neutral
/turf/open/floor/plasteel/dark/neutral
icon_state = "dark_neutral_full"
/turf/open/floor/plasteel/dark/neutral/checker
icon_state = "dark_neutral_checker"
/turf/open/floor/plasteel/dark/neutral/side
icon_state = "dark_neutral"
/turf/open/floor/plasteel/dark/neutral/corner
icon_state = "dark_neutral_corner"
// Dark Security
/turf/open/floor/plasteel/dark/security
icon_state = "dark_red_full"
/turf/open/floor/plasteel/dark/security/checker
icon_state = "dark_red_checker"
/turf/open/floor/plasteel/dark/security/side
icon_state = "dark_red"
/turf/open/floor/plasteel/dark/security/corner
icon_state = "dark_red_corner"
// Engineering
/turf/open/floor/plasteel/engineering
icon_state = "engineering_full"
/turf/open/floor/plasteel/engineering/side
icon_state = "engineering"
/turf/open/floor/plasteel/engineering/corner
icon_state = "engineering_corner"
// Atmospherics
/turf/open/floor/plasteel/atmospherics
icon_state = "atmospherics_full"
/turf/open/floor/plasteel/atmospherics/side
icon_state = "atmospherics"
/turf/open/floor/plasteel/atmospherics/corner
icon_state = "atmospherics_corner"
// Command
/turf/open/floor/plasteel/command
icon_state = "command_full"
/turf/open/floor/plasteel/command/side
icon_state = "command"
/turf/open/floor/plasteel/command/corner
icon_state = "command_corner"
// Medical
/turf/open/floor/plasteel/medical
icon_state = "medical_full"
/turf/open/floor/plasteel/medical/alt
icon_state = "medical_alt"
/turf/open/floor/plasteel/medical/side
icon_state = "medical"
/turf/open/floor/plasteel/medical/corner
icon_state = "medical_corner"
// Security
/turf/open/floor/plasteel/security
icon_state = "security_full"
/turf/open/floor/plasteel/security/side
icon_state = "security"
/turf/open/floor/plasteel/security/corner
icon_state = "security_corner"
// Cargo
/turf/open/floor/plasteel/cargo
icon_state = "cargo_full"
/turf/open/floor/plasteel/cargo/side
icon_state = "cargo"
/turf/open/floor/plasteel/cargo/corner
icon_state = "cargo_corner"
// Misc
/turf/open/floor/plasteel/showroomfloor/shower
icon_state = "shower"
/turf/open/floor/plasteel/goonplaque/alien
icon_state = "plaque1"
desc = "\"This is a plaque is a collaboration of iconography celebrating the peaceful collaboration between the people of Earth and distant alien species."
/turf/open/floor/plasteel/goonplaque/charter
icon_state = "plaque2"
desc = "\"A golden plaque. Etched into it is the introductory article for a cross-species interplanetary constitution, guaranteeing equal rights between species that Nanotrasen relunctantly agreed to."
code/game/turfs/simulated/floor/plating/misc_plating.dm
+1 -2
View File
@@ -198,8 +198,7 @@
/turf/open/floor/plating/ice/smooth
icon_state = "smooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/floor/plating/ice/smooth, /turf/open/floor/plating/ice)
/turf/open/floor/plating/ice/colder
canSmoothWith = list(/turf/open/floor/plating/ice/smooth, /turf/open/floor/plating/ice, /turf/open/floor/plating/ice/colder)
/turf/open/floor/plating/ice/colder
temperature = 140
code/game/turfs/simulated/lava.dm
+16 -1
View File
@@ -81,10 +81,25 @@
/turf/open/lava/TakeTemperature(temp)
/turf/open/lava/attackby(obj/item/C, mob/user, params)
..()
if(istype(C, /obj/item/stack/rods/lava))
var/obj/item/stack/rods/lava/R = C
var/obj/structure/lattice/lava/H = locate(/obj/structure/lattice/lava, src)
if(H)
to_chat(user, "<span class='warning'>There is already a lattice here!</span>")
return
if(R.use(1))
to_chat(user, "<span class='notice'>You construct a lattice.</span>")
playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE)
new /obj/structure/lattice/lava(locate(x, y, z))
else
to_chat(user, "<span class='warning'>You need one rod to build a heatproof lattice.</span>")
return
/turf/open/lava/proc/is_safe()
//if anything matching this typecache is found in the lava, we don't burn things
var/static/list/lava_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/stone_tile))
var/static/list/lava_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/stone_tile, /obj/structure/lattice/lava))
var/list/found_safeties = typecache_filter_list(contents, lava_safeties_typecache)
for(var/obj/structure/stone_tile/S in found_safeties)
if(S.fallen)
code/game/turfs/simulated/minerals.dm
+53 -1
View File
@@ -832,7 +832,7 @@
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
defer_change = TRUE
/turf/closed/mineral/gibtonite/ice
environment_type = "snow_cavern"
icon_state = "icerock_Gibtonite"
@@ -846,3 +846,55 @@
turf_type = /turf/open/floor/plating/asteroid/snow/ice/icemoon
baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
/turf/closed/mineral/strong
name = "Very strong rock"
desc = "Seems to be stronger than the other rocks in the area. Only a master of mining techniques could destroy this."
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
smooth_icon = 'icons/turf/walls/rock_wall.dmi'
/*
/turf/closed/mineral/strong/attackby(obj/item/I, mob/user, params)
if(!ishuman(user))
to_chat(usr, "<span class='warning'>Only a more advanced species could break a rock such as this one!</span>")
return FALSE
var/mob/living/carbon/human/H = user
if(H.mind.get_skill_level(/datum/skill/mining) >= SKILL_LEVEL_MASTER)
. = ..()
else
to_chat(usr, "<span class='warning'>The rock seems to be too strong to destroy. Maybe I can break it once I become a master miner.</span>")
*/
/turf/closed/mineral/strong/gets_drilled(mob/user)
if(!ishuman(user))
return // see attackby
/*
var/mob/living/carbon/human/H = user
if(!(H.mind.get_skill_level(/datum/skill/mining) >= SKILL_LEVEL_MASTER))
return
*/
drop_ores()
// H.client.give_award(/datum/award/achievement/skill/legendary_miner, H)
var/flags = NONE
if(defer_change) // TODO: make the defer change var a var for any changeturf flag
flags = CHANGETURF_DEFER_CHANGE
ScrapeAway(flags=flags)
addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction
// H.mind.adjust_experience(/datum/skill/mining, 100) //yay!
/turf/closed/mineral/strong/proc/drop_ores()
if(prob(10))
new /obj/item/stack/sheet/mineral/mythril(src, 5)
else
new /obj/item/stack/sheet/mineral/adamantine(src, 5)
/turf/closed/mineral/strong/acid_melt()
return
/turf/closed/mineral/strong/ex_act(severity, target)
return