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

Merge pull request #12185 from Detective-Google/this-is-why-we-can't-have-nice-things

Browse Source 
Nerfs multiple ice ruins
This commit is contained in:
kevinz000
2020-05-11 04:07:46 -07:00
committed by GitHub
parent 8cbe44f20c f844587652
commit 2d225540fa
4 changed files with 52 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm
View File

@@ -5,10 +5,6 @@
"ab" = (
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"ac" = (
/obj/effect/mob_spawn/human/engineer/rig,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"ad" = (
/obj/machinery/power/floodlight,
/obj/structure/cable{
@@ -176,10 +172,9 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"aI" = (
/obj/item/pda/engineering{
note = "To-do: Check on singularity status. Get a pint at eat. Nag the research manager for RCDs."
},
/turf/open/floor/plating/asteroid/snow/icemoon,
/obj/effect/turf_decal/stripes/line,
/obj/item/clothing/suit/space/hardsuit/engine,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"aJ" = (
/obj/effect/decal/cleanable/dirt,
@@ -346,20 +341,10 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"be" = (
/obj/item/card/id{
access = list(200,204,11,12,10);
assignment = "Senior Station Engineer";
desc = "A card used to provide ID and determine access across the station. There's blood dripping from the corner. Ew.";
name = "George 'Plastic' Miller's ID Card (Senior Station Engineer)";
registered_name = "George 'Plastic' Miller"
},
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"bf" = (
/obj/effect/gibspawner/generic,
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/blood/gibs/core,
/obj/item/clothing/suit/space/hardsuit/engine,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"bg" = (
@@ -544,10 +529,6 @@
/obj/item/shard/plasma,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"bz" = (
/obj/item/clothing/suit/space/hardsuit/engine,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
"bA" = (
/obj/item/flashlight/flare,
/turf/open/floor/plating/asteroid/snow/icemoon,
@@ -1013,13 +994,6 @@
},
/turf/open/floor/plating/icemoon,
/area/icemoon/surface/outdoors)
"cU" = (
/obj/effect/mob_spawn/human/engineer/rig,
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plating/icemoon,
/area/icemoon/surface/outdoors)
"cV" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -1032,12 +1006,7 @@
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"cX" = (
/obj/machinery/rnd/production/circuit_imprinter,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"cY" = (
/obj/machinery/rnd/production/protolathe/department/engineering,
/obj/machinery/light/small/broken,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
@@ -1437,9 +1406,9 @@ aa
aa
aa
aa
aI
aa
be
aa
aa
aa
aa
aa
@@ -1452,7 +1421,7 @@ ak
aa
"}
(9,1,1) = {"
ac
ab
ab
al
ap
@@ -1461,7 +1430,7 @@ aa
aa
aa
bf
bz
aa
aa
aa
af
@@ -1507,7 +1476,7 @@ bA
aa
aa
af
cA
aI
DM
dc
al
@@ -1529,7 +1498,7 @@ aa
ab
ab
cF
cU
gA
al
al
aO
@@ -1698,7 +1667,7 @@ cf
cr
cB
cI
cX
ab
aB
aa
aa

68
_maps/RandomRuins/IceRuins/icemoon_surface_hotsprings.dmm
View File

@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/indestructible/riveted/uranium,
/area/icemoon/surface/outdoors)
"b" = (
/turf/closed/mineral/random/snow/no_caves,
@@ -12,7 +12,17 @@
/obj/item/paper/crumpled{
info = "When one falls into this hot spring, they shall forever be turned into..."
},
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/open/floor/plating/beach/sand,
/area/icemoon/surface/outdoors)
"I" = (
/turf/closed/indestructible/fakeglass,
/area/icemoon/surface/outdoors)
"L" = (
/obj/structure/fluff/beach_umbrella,
/turf/open/floor/plating/beach/sand,
/area/icemoon/surface/outdoors)
"U" = (
/turf/open/floor/plating/beach/sand,
/area/icemoon/surface/outdoors)
(1,1,1) = {"
@@ -34,7 +44,7 @@ b
b
a
a
a
I
a
a
b
@@ -45,11 +55,11 @@ b
b
b
a
a
a
a
a
a
U
U
U
U
U
a
b
b
@@ -57,65 +67,65 @@ b
(4,1,1) = {"
b
a
a
a
U
L
c
c
c
a
a
U
U
a
b
"}
(5,1,1) = {"
b
a
a
U
c
c
c
c
c
a
U
a
b
"}
(6,1,1) = {"
b
a
a
I
U
c
c
c
c
c
a
a
U
I
b
"}
(7,1,1) = {"
b
a
a
U
c
c
c
c
c
a
U
a
b
"}
(8,1,1) = {"
b
a
a
a
U
L
c
c
c
a
a
U
U
a
b
"}
@@ -123,11 +133,11 @@ b
b
b
a
a
a
U
U
d
a
a
U
U
a
b
b
@@ -138,7 +148,7 @@ b
b
a
a
a
I
a
a
b

8
_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
View File

@@ -20,12 +20,6 @@
},
/turf/open/floor/mineral/diamond,
/area/icemoon/surface/outdoors)
"f" = (
/obj/structure/sign/poster/contraband/lusty_xenomorph,
/obj/structure/falsewall/abductor,
/obj/structure/fans/tiny,
/turf/open/floor/mineral/diamond,
/area/icemoon/surface/outdoors)
(1,1,1) = {"
a
@@ -101,7 +95,7 @@ d
e
d
c
f
b
a
a
"}

3
code/game/turfs/simulated/floor/plating/asteroid.dm
View File

@@ -203,8 +203,7 @@
mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/wolf = 50, /obj/structure/spawner/ice_moon = 3, \
/mob/living/simple_animal/hostile/asteroid/polarbear = 30, /obj/structure/spawner/ice_moon/polarbear = 3, \
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10)
flora_spawn_list = list(/obj/structure/flora/tree/pine = 2, /obj/structure/flora/grass/both = 12)
flora_spawn_list = list(/obj/structure/flora/tree/pine = 2, /obj/structure/flora/grass/both = 12, /obj/structure/flora/rock/icy = 6, /obj/structure/flora/rock/pile/icy = 6)
data_having_type = /turf/open/floor/plating/asteroid/airless/cave/snow/has_data
turf_type = /turf/open/floor/plating/asteroid/snow/icemoon
choose_turf_type = list(/turf/open/floor/plating/asteroid/snow/icemoon = 19, /turf/open/floor/plating/ice/icemoon = 1)