Merge pull request #1 from evilew/master

pulling shit up to date

GainStation13/code/game/donator.dm

@@ -1,136 +1,6 @@
-//GS13: donator items and other ckey-locked junk
-
-//commented out everything here, it's bugged
-
-// /datum/gear/donator/gatobadge_employee //these are available only to admins with CC-related characters
-// 	name = "GATO Badge - Employee"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/accessory/medal/gato_badge/employee
-// 	ckeywhitelist = list("sonoida", "yeeny")
-
-// /datum/gear/donator/gatobadge_middleman //these are available to players who were granted permission to have their characters to CC
-// 	name = "GATO Badge - Correspondent"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/accessory/medal/gato_badge/middleman
-// 	ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber",)
-
-// /datum/gear/donator/halsey_overcoat
-// 	name = "Halsey's Commander Overcoat"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/suit/chloe/halsey
-// 	ckeywhitelist = list("yeeny")
-
-// /datum/gear/donator/haydee_suit
-// 	name = "Haydee Suit"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/suit/space/hardsuit/engine/haydee
-// 	ckeywhitelist = list("lumu", "sonoida")
-
-// /datum/gear/donator/haydee_pistol
-// 	name = "Haydee Pistol"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/gun/ballistic/automatic/toy/pistol/haydee
-// 	ckeywhitelist = list("lumu", "sonoida")
-
-// /datum/gear/donator/rose_plush
-// 	name = "Dezir Rose Plush"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/toy/plush/gs13/rose
-// 	ckeywhitelist = list("eremitanovem", "sonoida")
-
-// /datum/gear/donator/chloe_plush
-// 	name = "Chloe Plush"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/toy/plush/gs13/chloe
-// 	ckeywhitelist = list("alphas0")
-
-// /datum/gear/donator/grimmy_coat
-// 	name = "Overcoat of the Destitute"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/suit/storage/blueshield/grimmy
-// 	ckeywhitelist = list("bbgrimmy")
-
-// /datum/gear/donator/tarek_gps
-// 	name = "Tarek's GPS"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/gps/mining
-// 	ckeywhitelist = list("e926user25")
-
-// /datum/gear/donator/milwaukee_crowbar
-// 	name = "Milwaukee Pocket Crowbar"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/crowbar/bronze/glaug
-// 	ckeywhitelist = list("happytpr")
-
-// /datum/gear/donator/fatfang
-// 	name = "Fattening Fangs Injector"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/dnainjector/fatfang
-// 	ckeywhitelist = list("sonoida")
-
-// /datum/gear/donator/toolbelt
-// 	name = "Empty Toolbelt"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/storage/belt/utility
-// 	ckeywhitelist = list("killmewitha22", "Killmewitha22", "KILLMEWITHA22", "sonoida")
-
-// //metha rossi you fat hog
-
-// /datum/gear/donator/wgspell_add
-// 	name = "Weight Gain Spellbook"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/book/granter/spell/fattening
-// 	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
-
-// /datum/gear/donator/wgspell_transfer
-// 	name = "Weight Transfer Spellbook"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/book/granter/spell/fattening/transfer
-// 	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
-
-// /datum/gear/donator/wgspell_take
-// 	name = "Weight Steal Spellbook"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/book/granter/spell/fattening/steal
-// 	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
-
-// /datum/gear/donator/white_eyepatch_cabal
-// 	name = "Cabal's Eyepatch"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/glasses/eyepatch/cabal
-// 	ckeywhitelist = list("spess_lizurd", "SPESS LIZURD", "spess lizurd", "SPESS_LIZURD", "spesslizurd", "sonoida")
-
-// /datum/gear/white_eyepatch //accessible to anyone, at donator's request
-// 	name = "White Eyepatch"
-// 	category = LOADOUT_CATEGORY_GLASSES
-// 	path = /obj/item/clothing/glasses/eyepatch/white
-
-// /datum/gear/donator/metis_plush
-// 	name = "Metis Plush"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/toy/plush/gs13/metis
-// 	ckeywhitelist = list("paraillegal", "Paraillegal")
-
-// /datum/gear/donator/wheelys
-// 	name = "Wheely-Heels"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/clothing/shoes/wheelys
-// 	ckeywhitelist = list("colorlessspy", "Colorlessspy")
-
-// /datum/gear/donator/crowbars_plush
-// 	name = "Crowbars Plush"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/toy/plush/gs13/crowbars
-// 	ckeywhitelist = list("M16nPregnant", "m16npregnant" )
-
-// /datum/gear/donator/sams_welder
-// 	name = "Sam's Unlucky Welder"
-// 	category = LOADOUT_CATEGORY_DONATOR
-// 	path = /obj/item/weldingtool/bronze
-// 	ckeywhitelist = list("almaniak", "Almaniak", "AlManiak")
 
 //
-//item presets for donator items
+//item presets for donator items and other gunk
 //
 /obj/item/clothing/glasses/eyepatch/white
 	name = "White eyepatch"
@@ -158,9 +28,24 @@
 	desc = "A Ginormous red overcoat that looks fit for a commander. Has a tag on it that reads: 'Property of Halsey Harmonten. Please return if lost!'"
 	armor = list("melee" = 20, "bullet" = 20, "laser" = 0,"energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 0) //worn by a captain player, might as well recompensate not wearing the carapace
 
+/obj/item/clothing/suit/storage/blueshield //Look man I don't know, this is the file it was in on Oracle. Don't shoot me. Please.
+	name = "blueshield coat"
+	desc = "An armored coat often worn by bodyguards. Tough because everyone knows deep down you're a softie."
+	icon = 'GainStation13/icons/obj/clothing/suits.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/suit.dmi'
+	icon_state = "blueshieldcoat"
+	item_state = "blueshieldcoat"
+	body_parts_covered = CHEST|LEGS|ARMS
+	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_box, /obj/item/ammo_casing,/obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton)
+	armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
+	cold_protection = CHEST|LEGS|ARMS
+	heat_protection = CHEST|LEGS|ARMS
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+
 /obj/item/clothing/suit/storage/blueshield/grimmy
 	name = "Overcoat of the Destitute"
 	desc = "Welcome all to the everlasting all-time low. Please put your hands together for the ever-failing one man show: Domino!"
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/crowbar/bronze/glaug
 	name = "Milwaukee Pocket Crowbar"

GainStation13/code/modules/client/loadout/uniform.dm

@@ -1,3 +1,4 @@
 /datum/gear/uniform/modularjumpsuit
 	name = "Grey jumpsuit (Modular)"
 	path = /obj/item/clothing/under/color/grey
+	cost = 0

GainStation13/code/modules/mod/modules/modules_fat.dm

@@ -212,4 +212,4 @@
 	name = "MOD exoskeleton"
 	category = LOADOUT_CATEGORY_HANDS
 	path = /obj/item/mod/control/pre_equipped/exoskeleton
-	cost = 4
+	cost = 3

_maps/RandomRuins/LavaRuins/lavaland_surface_hotsprings.dmm

@@ -9,6 +9,15 @@
 /obj/structure/bed/double,
 /turf/open/floor/plating/beach/sand,
 /area/lavaland/surface/outdoors)
+"o" = (
+/obj/structure/bed/double,
+/obj/item/reagent_containers/rag/towel,
+/turf/open/floor/plating/beach/sand,
+/area/lavaland/surface/outdoors)
+"u" = (
+/obj/structure/fans/tiny/invisible,
+/turf/open/floor/plating/beach/sand,
+/area/lavaland/surface/outdoors)
 "I" = (
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
@@ -19,6 +28,10 @@
 "U" = (
 /turf/open/floor/plating/beach/sand,
 /area/lavaland/surface/outdoors)
+"Z" = (
+/obj/item/flashlight/lantern,
+/turf/open/floor/plating/beach/sand,
+/area/lavaland/surface/outdoors)
 
 (1,1,1) = {"
 I
@@ -88,27 +101,27 @@ I
 (6,1,1) = {"
 I
 a
-U
+Z
 c
 c
 c
 c
 c
-U
+Z
 a
 I
 "}
 (7,1,1) = {"
 I
-U
+u
 U
 k
-k
+o
 U
 k
-k
-U
+o
 U
+u
 I
 "}
 (8,1,1) = {"
@@ -143,7 +156,7 @@ I
 I
 a
 a
-U
+u
 a
 a
 I

_maps/RandomRuins/LavaRuins/lavaland_surface_wizard.dmm

@@ -473,13 +473,13 @@ c
 a
 a
 a
-a
-a
-a
-a
-a
-a
-a
+D
+D
+D
+D
+D
+D
+D
 D
 b
 b
@@ -495,7 +495,7 @@ c
 a
 a
 a
-a
+D
 e
 j
 o
@@ -517,7 +517,7 @@ c
 a
 a
 a
-a
+D
 f
 k
 p
@@ -539,7 +539,7 @@ c
 a
 a
 a
-a
+D
 g
 l
 q
@@ -561,7 +561,7 @@ c
 a
 a
 a
-a
+D
 h
 m
 r
@@ -583,7 +583,7 @@ c
 a
 a
 a
-a
+D
 i
 n
 s
@@ -605,13 +605,13 @@ c
 c
 a
 a
-a
-a
-a
-a
-a
-a
-a
+D
+D
+D
+D
+D
+D
+D
 D
 b
 b

_maps/map_files/KiloStation/KiloStation.dmm

@@ -8145,7 +8145,6 @@
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/storage/briefcase,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
@@ -8153,6 +8152,8 @@
 /obj/machinery/airalarm{
 	pixel_y = 22
 	},
+/obj/item/book/manual/gato_spacelaw,
+/obj/item/storage/briefcase,
 /turf/open/floor/plasteel/dark,
 /area/service/lawoffice)
 "aol" = (
@@ -8237,7 +8238,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/item/book/manual/wiki/security_space_law,
 /obj/item/taperecorder{
 	pixel_x = 5
 	},
@@ -8309,14 +8309,14 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/taperecorder{
-	pixel_x = 5
-	},
 /obj/structure/table,
 /obj/machinery/newscaster{
 	pixel_y = 30
 	},
+/obj/item/book/manual/gato_spacelaw,
+/obj/item/taperecorder{
+	pixel_x = 5
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/courtroom)
 "aox" = (

code/modules/events/prison_break.dm

@@ -1,7 +1,7 @@
 /datum/round_event_control/grey_tide
 	name = "Grey Tide"
 	typepath = /datum/round_event/grey_tide
-	max_occurrences = 2
+	max_occurrences = 0 //GS13 - disabling for now
 	min_players = 12
 	category = EVENT_CATEGORY_ENGINEERING
 	description = "Bolts open all doors in one or more departments."

code/modules/mob/living/carbon/human/innate_abilities/coiling.dm

@@ -9,6 +9,8 @@
 	var/currently_coiling = FALSE
 	var/mob/living/carbon/human/currently_coiled
 	var/mutable_appearance/tracked_overlay
+	//GS13 Edit
+	var/stored_tail
 
 /datum/action/innate/ability/coiling/Activate()
 	// make sure they meet the mobility/check flags
@@ -56,6 +58,8 @@
 
 	// set our overlay to new image
 	var/mob/living/carbon/human/user = owner
+	//GS13 Edit
+	stored_tail = user.dna.features["taur"]
 	user.dna.species.mutant_bodyparts["taur"] = "Naga (coiled)"
 	user.dna.features["taur"] = "Naga (coiled)"
 	user.update_mutant_bodyparts()
@@ -79,8 +83,9 @@
 	UnregisterSignal(owner, COMSIG_ATOM_DIR_CHANGE)
 
 	// change overlay back to original image
-	H.dna.species.mutant_bodyparts["taur"] = "Naga"
-	H.dna.features["taur"] = "Naga"
+	//GS13 Edit
+	H.dna.species.mutant_bodyparts["taur"] = stored_tail
+	H.dna.features["taur"] = stored_tail
 	H.update_mutant_bodyparts()
 
 	H.update_body()

code/modules/mob/living/carbon/human/species.dm

@@ -925,10 +925,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		if(A.type == /datum/action/innate/ability/coiling)
 			found_action = A
 
-	if(found_action && (!tauric || (H.dna.features["taur"] != "Naga" && H.dna.features["taur"] != "Naga (coiled)")))
+	//GS13 Edit - Adding action for other naga tails
+	if(found_action && (!tauric || ((H.dna.features["taur"] != "Naga" && H.dna.features["taur"] != "Fat Naga" && H.dna.features["taur"] != "Alt Naga") && H.dna.features["taur"] != "Naga (coiled)")))
 		found_action.Remove(H)
 
-	if(!found_action && tauric && H.dna.features["taur"] == "Naga")
+	//GS13 Edit - Adding action for other naga tails
+	if(!found_action && tauric && (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga"))
 		found_action = new /datum/action/innate/ability/coiling()
 		found_action.Grant(H)
 

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -39,7 +39,7 @@
 	ckeywhitelist = list("lumu", "sonoida")
 
 /datum/gear/donator/rose_plush
-	name = "Dezir Rose Plush"
+	name = "Dezir Rose Plussh"
 	category = LOADOUT_CATEGORY_DONATOR
 	path = /obj/item/toy/plush/gs13/rose
 	ckeywhitelist = list("eremitanovem", "sonoida", "Absolutely_Free", "absolutely_free", "ABSOLUTELY_FREE")
@@ -54,7 +54,13 @@
 	name = "Overcoat of the Destitute"
 	category = LOADOUT_CATEGORY_DONATOR
 	path = /obj/item/clothing/suit/storage/blueshield/grimmy
-	ckeywhitelist = list("bbgrimmy")
+	ckeywhitelist = list("bbgrimmy", "BBGrimmy", "Bbgrimmy")
+
+/datum/gear/donator/cosmic_coat
+	name = "Cosmic Coat"
+	category = LOADOUT_CATEGORY_DONATOR
+	path = /obj/item/clothing/suit/hooded/wintercoat/cosmic
+	ckeywhitelist = list("Neun", "neun", "NEUN")
 
 /datum/gear/donator/tarek_gps
 	name = "Tarek's GPS"