Merge branch 'guncase' of https://github.com/Martinpachu/Shiptest-martin

into guncase
shiptest-ss13 · May 18, 2024 · 15a3c34 · 15a3c34
2 parents 7fcaa25 + 7cc1dd7
commit 15a3c34
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 966 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt
@@ -302,10 +302,6 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 
 
 	SpaceRuins:
-		File Name = "_maps\RandomRuins\SpaceRuins\.dmm"
-		Size = (x = 18)(y = 23)(z = 1)
-		Tags = "No Combat", "Minor Loot", "Shelter"
-
 		File Name = "_maps\RandomRuins\SpaceRuins\astraeus.dmm"
 		Size = (x = 47)(y = 35)(z = 1)
 		Tags = "Minor Combat Challenge", "Medium Loot", "Inhospitable"

diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm
@@ -39,13 +39,6 @@
 	description = "In the darkest times, we will find our way home."
 */
 
-/datum/map_template/ruin/space/djstation
-	id = "djstation"
-	suffix = "djstation.dmm"
-	name = "DJ Station"
-	description = "Until very recently this pirate radio station was used to harangue local space stations over a variety of perceived \"ethics violations\". \
-	It seems like someone finally got sick of it, but the equipment still works."
-
 /datum/map_template/ruin/space/crashedship
 	id = "crashedship"
 	suffix = "crashedship.dmm"

diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm
@@ -167,18 +167,6 @@
 	name = "Derelict Atmospherics"
 	icon_state = "red"
 
-//DJSTATION
-
-/area/ruin/space/djstation
-	name = "Ruskie DJ Station"
-	icon_state = "DJ"
-	has_gravity = STANDARD_GRAVITY
-
-/area/ruin/space/djstation/solars
-	name = "DJ Station Solars"
-	icon_state = "DJ"
-	has_gravity = STANDARD_GRAVITY
-
 //OLD AI SAT
 
 /area/tcommsat/oldaisat

diff --git a/code/modules/ruins/spaceruin_code/DJstation.dm b/code/modules/ruins/spaceruin_code/DJstation.dm
diff --git a/html/changelogs/AutoChangeLog-pr-2990.yml b/html/changelogs/AutoChangeLog-pr-2990.yml
diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml
@@ -50,3 +50,7 @@
   FleetingExpertise:
   - rscadd: Added new sprites for the plunger, rolling pin and push broom by FleetingExpertise
   - rscadd: Most knifes in the game have  been resprited!
+2024-05-18:
+  spookypineapple:
+  - imageadd: Snowy grass, suit storage units, bookcases, and chem machines have been
+      resprited
diff --git a/shiptest.dme b/shiptest.dme
@@ -3265,7 +3265,6 @@
 #include "code\modules\ruins\spaceruin_code\crashedclownship.dm"
 #include "code\modules\ruins\spaceruin_code\crashedship.dm"
 #include "code\modules\ruins\spaceruin_code\deepstorage.dm"
-#include "code\modules\ruins\spaceruin_code\DJstation.dm"
 #include "code\modules\ruins\spaceruin_code\forgottenship.dm"
 #include "code\modules\ruins\spaceruin_code\hellfactory.dm"
 #include "code\modules\ruins\spaceruin_code\hilbertshotel.dm"