Merge remote-tracking branch 'upstream/master' into PortsPsionics

Author: cowbot92

.github/PULL_REQUEST_TEMPLATE.md

@@ -32,17 +32,17 @@ Important documentation information includes, but is not limited to: any numeric
 <!-- Edit the changelog below to reflect the changes made by this PR, even if the changes are minor - required for every PR that has player-facing changes.
 If you add a name after the ':cl:', that name will be used in the changelog. Leave it empty to use your GitHub name. -->
 
-:cl:  
+:cl:
 rscadd: Added new things  
 rscdel: Removed old things  
-bugfix: fixed a few things  
+bugfix: Fixed a few things  
 wip: This is work in progress  
-tweak: tweaked a few things  
-soundadd: added a new sound thingy  
-sounddel: removed an old sound thingy  
-imageadd: added some icons and images  
-imagedel: deleted some icons and images
+tweak: Tweaked a few things  
+soundadd: Added a new sound thingy  
+sounddel: Removed an old sound thingy  
+imageadd: Added some icons and images  
+imagedel: Deleted some icons and images
 mapping: This is a mapping change
-spellcheck: fixed a few typos  
+spellcheck: Fixed a few typos  
 experimental: This is experimental
 /:cl:

_maps/RandomRuins/JungleRuins/jungleland_barren_drake.dmm

@@ -0,0 +1,100 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"f" = (
+/obj/structure/flora/rock/jungle,
+/turf/open/floor/plating/dirt/jungleland/jungle,
+/area/template_noop)
+"i" = (
+/obj/structure/flora/junglebush/b,
+/turf/open/floor/plating/dirt/jungleland/jungle,
+/area/template_noop)
+"n" = (
+/obj/structure/flora/grass/jungle,
+/turf/open/floor/plating/dirt/jungleland/jungle,
+/area/template_noop)
+"o" = (
+/obj/structure/flora/junglebush/large,
+/turf/open/floor/plating/dirt/jungleland/jungle,
+/area/template_noop)
+"r" = (
+/obj/structure/flora/junglebush/c,
+/turf/open/floor/plating/dirt/jungleland/jungle,
+/area/template_noop)
+"E" = (
+/obj/structure/flora/rock/pile/largejungle,
+/mob/living/simple_animal/hostile/megafauna/dragon/jungle,
+/turf/open/water/smooth/toxic_pit,
+/area/template_noop)
+"O" = (
+/obj/structure/flora/grass/jungle,
+/turf/open/water/smooth/toxic_pit,
+/area/template_noop)
+"R" = (
+/turf/open/floor/plating/dirt/jungleland/jungle,
+/area/template_noop)
+
+(1,1,1) = {"
+a
+R
+R
+R
+n
+R
+a
+"}
+(2,1,1) = {"
+R
+R
+o
+R
+R
+R
+R
+"}
+(3,1,1) = {"
+R
+R
+R
+O
+R
+R
+n
+"}
+(4,1,1) = {"
+R
+R
+O
+E
+O
+R
+R
+"}
+(5,1,1) = {"
+i
+R
+R
+O
+R
+R
+R
+"}
+(6,1,1) = {"
+R
+n
+R
+R
+R
+f
+R
+"}
+(7,1,1) = {"
+a
+R
+R
+r
+R
+R
+a
+"}

_maps/RandomRuins/JungleRuins/jungleland_jungle_dragon.dmm

@@ -6,7 +6,7 @@
 /obj/item/clothing/shoes/xeno_wraps/science,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/under/rank/scientist/skirt,
-/obj/item/clothing/under/rank/security/skirt,
+/obj/item/clothing/under/rank/security/officer/skirt,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/pod/light,
 /area/ruin/powered)

_maps/RandomRuins/LavaRuins/lavaland_surface_researchpod.dmm

@@ -167,7 +167,7 @@
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
 /obj/effect/decal/cleanable/blood/gibs,
-/obj/item/clothing/under/rank/security,
+/obj/item/clothing/under/rank/security/officer,
 /obj/item/clothing/suit/armor/vest,
 /obj/item/clothing/head/helmet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,