Skip to content

Commit

Permalink
Merge branch 'icelodge' of https://github.com/Gristlebee/Shiptest-Fork
Browse files Browse the repository at this point in the history
…into icelodge
  • Loading branch information
Gristlebee committed Sep 5, 2024
2 parents 24d6a9f + ac06b17 commit af0c53b
Show file tree
Hide file tree
Showing 467 changed files with 13,495 additions and 5,375 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
pixel_x = 9;
pixel_y = -1
},
/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
/obj/item/gun/ballistic/automatic/assault/cm82{
pixel_y = 7;
pixel_x = -9
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
dir = 9
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/spawner/burrow/lava_planet,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/winter_biodome/living_quarters)
"fs" = (
Expand Down Expand Up @@ -896,7 +896,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/spawner/burrow/lava_planet,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/winter_biodome/living_quarters)
"lq" = (
Expand Down Expand Up @@ -952,7 +952,7 @@
"mD" = (
/obj/effect/turf_decal/solgov/wood/center,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/spawner/burrow/lava_planet,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/wood,
/area/ruin/unpowered/winter_biodome/living_quarters)
"mX" = (
Expand Down Expand Up @@ -1081,7 +1081,7 @@
},
/obj/effect/turf_decal/corner/opaque/solgovgold/diagonal,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/spawner/burrow/lava_planet,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/plasteel/white,
/area/ruin/unpowered/winter_biodome/engineering)
"qt" = (
Expand Down Expand Up @@ -1467,10 +1467,10 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/blood/gibs/up,
/obj/structure/spawner/burrow/lava_planet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
},
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/wood,
/area/ruin/unpowered/winter_biodome/entrance)
"Ar" = (
Expand Down Expand Up @@ -1925,7 +1925,7 @@
/turf/open/floor/wood,
/area/ruin/unpowered/winter_biodome/sauna)
"Lf" = (
/obj/structure/spawner/burrow/lava_planet,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/grass/snow,
/area/ruin/unpowered/winter_biodome)
"Lt" = (
Expand Down
14 changes: 9 additions & 5 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@
/area/ruin/unpowered/buried_shrine)
"nq" = (
/obj/structure/stone_tile/surrounding,
/obj/structure/spawner/burrow/lava_planet,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"nz" = (
Expand Down Expand Up @@ -930,7 +930,10 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"wM" = (
/obj/structure/stone_tile/slab,
/obj/structure/stone_tile/surrounding/cracked{
dir = 4
},
/obj/structure/stone_tile/center,
/obj/structure/spawner/burrow/lava_planet,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
Expand Down Expand Up @@ -1648,6 +1651,7 @@
dir = 1
},
/obj/structure/spawner/burrow/lava_planet,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/buried_shrine)
"QR" = (
Expand Down Expand Up @@ -1864,7 +1868,7 @@
/obj/structure/stone_tile{
dir = 1
},
/obj/structure/spawner/burrow/lava_planet,
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
/area/ruin/unpowered/buried_shrine)
"Xr" = (
Expand Down Expand Up @@ -3928,7 +3932,7 @@ LJ
ta
NN
ta
Xv
wM
Ad
mM
Ad
Expand Down Expand Up @@ -4095,7 +4099,7 @@ ee
WZ
WZ
yz
wM
Ad
tL
WZ
Yh
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2417,7 +2417,7 @@
/obj/item/toy/plush/moth/firewatch,
/obj/item/toy/plush/lizardplushie,
/obj/item/toy/plush/knight,
/obj/item/toy/prize/mauler,
/obj/item/toy/prize/touro,
/obj/item/toy/talking/AI,
/turf/open/floor/plasteel/mono/white,
/area/ruin/rockplanet/shippingdockwarehouse)
Expand Down
4 changes: 2 additions & 2 deletions _maps/configs/pgf_crying_sun.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"officer": true,
"slots": 1
},
"Bridge Crew": {
"Helmsman": {
"outfit": "/datum/outfit/job/gezena/assistant/bridge",
"slots": 1
},
Expand All @@ -37,7 +37,7 @@
"outfit": "/datum/outfit/job/gezena/assistant",
"slots": 2
},
"Marine Sergeant": {
"Marine Lieutenant": {
"outfit": "/datum/outfit/job/gezena/hos",
"slots": 1
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1084,11 +1084,11 @@
/area/centcom/control)
"apm" = (
/obj/structure/rack,
/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
pixel_x = 1;
pixel_y = 4
},
/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
pixel_x = -4;
pixel_y = -2
},
Expand Down
Loading

0 comments on commit af0c53b

Please sign in to comment.