Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

…to bible

.github/CODEOWNERS

@@ -4,22 +4,39 @@
 # In the event that multiple org members are to be informed of changes
 # to the same file or dir, add them to the end under Multiple Owners
 
-# MarkSuckerberg
-/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
-/code/modules/shuttle/ @MarkSuckerberg
-/code/modules/overmap/ @MarkSuckerberg
-
-# Teams
+# TEAMS
 
 # Map Maintainers
 /_maps/ @shiptest-ss13/maptainers
 
 # Sprite Maintainers
 /icons/ @shiptest-ss13/spritetainers
-/whitesands/icons/ @shiptest-ss13/spritetainers
 
 # CI and tool chains
 /tools/ @shiptest-ss13/admins
 
-#SIC SEMPER TYRANNIS
+
+# MAINTAINERS
+
+# FalloutFalcon
+
+/code/game/objects/items/storage/ration.dm @FalloutFalcon
+/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @FalloutFalcon
+/code/modules/food_and_drinks/food/ration.dm @FalloutFalcon
+/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @FalloutFalcon
+/code/modules/projectiles @FalloutFalcon
+/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @FalloutFalcon
+/code/modules/unit_tests/icons @FalloutFalcon
+
+# MarkSuckerberg
+
+/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
+/code/modules/shuttle/ @MarkSuckerberg
+/code/modules/overmap/ @MarkSuckerberg
 /_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MarkSuckerberg
+
+
+# CONTRIBUTORS
+
+
+# MULTIPLE OWNERS

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,6 @@
 add: Added new things
 add: Added more things
 del: Removed old things
-tweak: tweaked a few things
 balance: rebalanced something
 fix: fixed a few things
 soundadd: added a new sound thingy

_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm

@@ -667,7 +667,7 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Bg" = (
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
-/mob/living/simple_animal/hostile/pirate/melee{
+/mob/living/simple_animal/hostile/human/pirate/melee{
 	faction = list("beach","pirate")
 	},
 /turf/open/floor/plastic,
@@ -827,7 +827,7 @@
 /area/ruin/beach)
 "Gt" = (
 /obj/effect/turf_decal/corner/opaque/lightgrey/diagonal,
-/mob/living/simple_animal/hostile/cat_butcherer{
+/mob/living/simple_animal/hostile/human/cat_butcherer{
 	atmos_requirements = list("min_oxy"=0,"max_oxy"=0,"min_tox"=0,"max_tox"=0,"min_co2"=0,"max_co2"=0,"min_n2"=0,"max_n2"=0);
 	desc = "A profession carp butcher, gone mad due to carptoxin exposure. There seems to be something in their pocket...";
 	faction = list("beach","pirate");
@@ -853,7 +853,7 @@
 "GP" = (
 /obj/structure/chair/sofa/brown/right/directional/south,
 /obj/effect/decal/cleanable/cobweb,
-/mob/living/simple_animal/hostile/pirate/melee{
+/mob/living/simple_animal/hostile/human/pirate/melee{
 	faction = list("beach","pirate")
 	},
 /turf/open/floor/carpet,
@@ -1045,7 +1045,7 @@
 /obj/structure/chair/plastic{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/pirate/ranged{
+/mob/living/simple_animal/hostile/human/pirate/ranged{
 	faction = list("beach","pirate")
 	},
 /turf/open/floor/wood/ebony,
@@ -1135,7 +1135,7 @@
 /area/ruin/beach)
 "Rh" = (
 /obj/structure/chair/sofa/brown/corner/directional/south,
-/mob/living/simple_animal/hostile/pirate/melee{
+/mob/living/simple_animal/hostile/human/pirate/melee{
 	faction = list("beach","pirate")
 	},
 /turf/open/floor/carpet,
@@ -1250,7 +1250,7 @@
 	pixel_x = 4;
 	layer = 2.9
 	},
-/mob/living/simple_animal/hostile/pirate/ranged{
+/mob/living/simple_animal/hostile/human/pirate/ranged{
 	faction = list("beach","pirate")
 	},
 /turf/open/floor/wood/ebony,
@@ -1333,7 +1333,7 @@
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "ZJ" = (
-/mob/living/simple_animal/hostile/pirate/melee{
+/mob/living/simple_animal/hostile/human/pirate/melee{
 	faction = list("beach","pirate")
 	},
 /turf/open/floor/wood,

_maps/RandomRuins/BeachRuins/beach_float_resort.dmm

@@ -237,14 +237,6 @@
 	light_range = 2
 	},
 /area/ruin/beach/float_resort/villa)
-"gr" = (
-/obj/structure/table/wood,
-/obj/structure/curtain/cloth,
-/obj/item/nullrod/tribal_knife,
-/turf/open/floor/wood{
-	light_range = 2
-	},
-/area/ruin/beach/float_resort/villa)
 "gQ" = (
 /obj/structure/flora/ausbushes/genericbush,
 /turf/open/floor/plating/grass/beach,
@@ -2502,7 +2494,7 @@ kp
 kp
 kp
 kp
-gr
+ar
 OH
 OH
 OH

_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm

@@ -385,7 +385,7 @@
 	},
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "jE" = (
-/mob/living/simple_animal/hostile/pirate/ranged{
+/mob/living/simple_animal/hostile/human/pirate/ranged{
 	environment_smash = 0;
 	faction = list("pirate","mining")
 	},
@@ -522,7 +522,7 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/mob/living/simple_animal/hostile/pirate/melee{
+/mob/living/simple_animal/hostile/human/pirate/melee{
 	environment_smash = 0;
 	faction = list("pirate","mining")
 	},
@@ -1508,7 +1508,7 @@
 /turf/open/floor/plating/asteroid/sand/lit,
 /area/overmap_encounter/planetoid/cave/explored)
 "Vc" = (
-/mob/living/simple_animal/hostile/pirate/melee{
+/mob/living/simple_animal/hostile/human/pirate/melee{
 	environment_smash = 0;
 	faction = list("pirate","mining")
 	},

_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm

@@ -417,7 +417,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/pirate/ranged/space,
+/mob/living/simple_animal/hostile/human/pirate/ranged/space,
 /turf/open/floor/wood,
 /area/ruin/beach/treasure_cove)
 "oR" = (
@@ -970,12 +970,12 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/pirate/melee,
+/mob/living/simple_animal/hostile/human/pirate/melee,
 /turf/open/floor/plating/dirt/jungle/lit,
 /area/ruin/beach/treasure_cove)
 "EU" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/pirate/melee,
+/mob/living/simple_animal/hostile/human/pirate/melee,
 /turf/open/floor/plating/dirt/jungle/lit,
 /area/ruin/beach/treasure_cove)
 "Gm" = (
@@ -1301,7 +1301,7 @@
 /obj/structure/chair/wood{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/pirate/ranged,
+/mob/living/simple_animal/hostile/human/pirate/ranged,
 /turf/open/floor/carpet/red,
 /area/ruin/beach/treasure_cove)
 "SX" = (

_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm

@@ -84,8 +84,8 @@
 "cN" = (
 /obj/structure/safe/floor,
 /obj/item/hand_tele,
-/obj/item/stack/sheet/mineral/adamantine,
-/obj/item/stack/sheet/mineral/adamantine,
+/obj/item/stack/sheet/mineral/hidden/hellstone,
+/obj/item/stack/sheet/mineral/hidden/hellstone,
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/ruin/unpowered/corprejectrooms)
 "cP" = (
@@ -518,7 +518,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 9
 	},
-/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
+/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
 	desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
 	faction = list("DeserterNT");
 	name = "Benny Bleighch"
@@ -566,7 +566,7 @@
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectrooms)
 "or" = (
-/mob/living/simple_animal/hostile/nanotrasen/elite{
+/mob/living/simple_animal/hostile/human/nanotrasen/elite{
 	desc = "A former major player for Nanotrasen militaristic needs. He doesn't seem like someone who'd want to talk over tea.";
 	faction = list("DeserterNT");
 	name = "Sam the Sharp"
@@ -780,7 +780,7 @@
 /area/ruin/unpowered/corprejectrooms)
 "tb" = (
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
+/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
 	desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
 	faction = list("DeserterNT");
 	name = "Rebecca Slouch"
@@ -1064,7 +1064,7 @@
 /obj/structure/cable/blue{
 	icon_state = "4-9"
 	},
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
+/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
 	desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
 	faction = list("DeserterNT");
 	name = "Gloria the Glorious"
@@ -1106,7 +1106,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/nanotrasen/screaming{
+/mob/living/simple_animal/hostile/human/nanotrasen/screaming{
 	desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
 	faction = list("DeserterNT");
 	name = "Jimmy Firecracker"
@@ -1726,11 +1726,11 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/stack/sheet/bluespace_crystal/five,
-/obj/item/stack/sheet/mineral/bananium{
+/obj/item/stack/sheet/mineral/hidden/hellstone{
 	amount = 15
 	},
 /obj/item/stack/sheet/mineral/gold/twenty,
-/obj/item/stack/sheet/mineral/runite/ten,
+/obj/item/stack/sheet/mineral/hidden/hellstone/ten,
 /obj/item/toy/figure/captain,
 /obj/item/organ/cyberimp/brain/anti_stun,
 /obj/item/disk/design_disk/adv/knight_gear,
@@ -1879,7 +1879,7 @@
 /obj/structure/cable/blue{
 	icon_state = "4-9"
 	},
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
+/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
 	desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
 	faction = list("DeserterNT");
 	name = "Todd Clorox"
@@ -1902,7 +1902,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/nanotrasen/elite{
+/mob/living/simple_animal/hostile/human/nanotrasen/elite{
 	desc = "A former major player for Nanotrasen militaristic needs. He doesn't seem like someone who'd want to talk over tea.";
 	faction = list("DeserterNT");
 	name = "Max the Maniac"
@@ -1927,7 +1927,7 @@
 /area/ruin/unpowered/corprejectrooms)
 "Rp" = (
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
-/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
+/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
 	desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
 	faction = list("DeserterNT");
 	name = "Gordon Lary"
@@ -2003,7 +2003,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
+/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
 	desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
 	faction = list("DeserterNT");
 	name = "Gary Larson"
@@ -2086,15 +2086,15 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/nanotrasen/ranged/assault{
+/mob/living/simple_animal/hostile/human/nanotrasen/ranged/assault{
 	desc = "No longer a member of Nanotrasen's more militaristic forces. Seems grumpy.";
 	faction = list("DeserterNT");
 	name = "Nancy Drew"
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/unpowered/corprejectrooms)
 "Us" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg{
+/mob/living/simple_animal/hostile/human/nanotrasen/ranged/smg{
 	desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
 	faction = list("DeserterNT");
 	name = "Larry Liessahl"
@@ -2231,7 +2231,7 @@
 /obj/structure/cable/blue{
 	icon_state = "0-4"
 	},
-/mob/living/simple_animal/hostile/nanotrasen/screaming{
+/mob/living/simple_animal/hostile/human/nanotrasen/screaming{
 	desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
 	faction = list("DeserterNT");
 	name = "Wendy Wallaby"
@@ -2286,7 +2286,7 @@
 /obj/structure/cable/blue{
 	icon_state = "4-5"
 	},
-/mob/living/simple_animal/hostile/nanotrasen/screaming{
+/mob/living/simple_animal/hostile/human/nanotrasen/screaming{
 	desc = "An officer no longer part of Nanotrasen's private security force, he seems rather unpleased to meet you.";
 	faction = list("DeserterNT");
 	name = "Wetzel the Pretzel"

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_newcops.dmm

@@ -1028,7 +1028,7 @@
 /area/ruin/powered)
 "Wp" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space,
+/mob/living/simple_animal/hostile/human/syndicate/ranged/shotgun/space,
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered)
 "Ws" = (

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

@@ -101,9 +101,6 @@
 "la" = (
 /obj/effect/decal/cleanable/blood/gibs/up,
 /obj/effect/mob_spawn/human/corpse/assistant,
-/mob/living/simple_animal/hostile/skeleton/eskimo{
-	name = "Village Hunter"
-	},
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/overmap_encounter/planetoid/cave/explored)
 "lg" = (
@@ -486,7 +483,7 @@
 /area/ruin/powered)
 "PQ" = (
 /obj/effect/decal/cleanable/blood/splatter,
-/mob/living/simple_animal/hostile/frontier/ranged/trooper,
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
 /area/ruin/powered)