Merge branch 'master' of https://github.com/ZomgPonies/Paradise

baystation12.dme

@@ -5,6 +5,71 @@
 // END_INTERNALS
 // BEGIN_FILE_DIR
 #define FILE_DIR .
+#define FILE_DIR "code"
+#define FILE_DIR "code/TriDimension"
+#define FILE_DIR "code/unused"
+#define FILE_DIR "code/unused/goonheist"
+#define FILE_DIR "code/WorkInProgress"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
+#define FILE_DIR "code/WorkInProgress/Susan"
+#define FILE_DIR "html"
+#define FILE_DIR "icons"
+#define FILE_DIR "icons/48x48"
+#define FILE_DIR "icons/ass"
+#define FILE_DIR "icons/effects"
+#define FILE_DIR "icons/mecha"
+#define FILE_DIR "icons/misc"
+#define FILE_DIR "icons/mob"
+#define FILE_DIR "icons/mob/human_races"
+#define FILE_DIR "icons/mob/otherHuman"
+#define FILE_DIR "icons/mob/species"
+#define FILE_DIR "icons/mob/species/vox"
+#define FILE_DIR "icons/mob/species/vox/armalis"
+#define FILE_DIR "icons/mob/spirits"
+#define FILE_DIR "icons/NTOS"
+#define FILE_DIR "icons/obj"
+#define FILE_DIR "icons/obj/assemblies"
+#define FILE_DIR "icons/obj/atmospherics"
+#define FILE_DIR "icons/obj/clothing"
+#define FILE_DIR "icons/obj/doors"
+#define FILE_DIR "icons/obj/flora"
+#define FILE_DIR "icons/obj/machines"
+#define FILE_DIR "icons/obj/pipes"
+#define FILE_DIR "icons/obj/power_cond"
+#define FILE_DIR "icons/pda_icons"
+#define FILE_DIR "icons/pods"
+#define FILE_DIR "icons/spideros_icons"
+#define FILE_DIR "icons/stamp_icons"
+#define FILE_DIR "icons/Testing"
+#define FILE_DIR "icons/turf"
+#define FILE_DIR "icons/vending_icons"
+#define FILE_DIR "nano"
+#define FILE_DIR "nano/images"
+#define FILE_DIR "sound"
+#define FILE_DIR "sound/AI"
+#define FILE_DIR "sound/ambience"
+#define FILE_DIR "sound/effects"
+#define FILE_DIR "sound/effects/turret"
+#define FILE_DIR "sound/effects/wind"
+#define FILE_DIR "sound/hallucinations"
+#define FILE_DIR "sound/items"
+#define FILE_DIR "sound/machines"
+#define FILE_DIR "sound/mecha"
+#define FILE_DIR "sound/misc"
+#define FILE_DIR "sound/music"
+#define FILE_DIR "sound/piano"
+#define FILE_DIR "sound/turntable"
+#define FILE_DIR "sound/violin"
+#define FILE_DIR "sound/voice"
+#define FILE_DIR "sound/voice/complionator"
+#define FILE_DIR "sound/voice/Serithi"
+#define FILE_DIR "sound/vox"
+#define FILE_DIR "sound/vox_fem"
+#define FILE_DIR "sound/weapons"
 // END_FILE_DIR
 // BEGIN_PREFERENCES
 #define DEBUG
@@ -883,10 +948,10 @@
 #include "code\modules\customitems\item_spawning.dm"
 #include "code\modules\customitems\definitions\base.dm"
 #include "code\modules\destilery\main.dm"
-#include "code\modules\detectivework\detective_work.dm"
-#include "code\modules\detectivework\evidence.dm"
-#include "code\modules\detectivework\footprints_and_rag.dm"
-#include "code\modules\detectivework\scanner.dm"
+#include "code\modules\DetectiveWork\detective_work.dm"
+#include "code\modules\DetectiveWork\evidence.dm"
+#include "code\modules\DetectiveWork\footprints_and_rag.dm"
+#include "code\modules\DetectiveWork\scanner.dm"
 #include "code\modules\economy\Accounts.dm"
 #include "code\modules\economy\Accounts_DB.dm"
 #include "code\modules\economy\ATM.dm"

code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm

@@ -8,7 +8,7 @@ datum/directive/terminations/alien_fraud/get_crew_to_terminate()
 	var/list/aliens[0]
 	for(var/mob/living/carbon/human/H in player_list)
 		if (H.species.name == "Tajaran" || H.species.name == "Unathi")
-			aliens.Add(H)
+			aliens+=H
 	return aliens
 
 datum/directive/terminations/alien_fraud/get_description()

code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm

@@ -21,9 +21,9 @@ datum/directive/bluespace_contagion/initialize()
 			break
 
 		var/mob/living/carbon/human/candidate = pick(candidates)
-		candidates.Remove(candidate)
-		infected.Add(candidate)
-		infected_names.Add("[candidate.mind.assigned_role] [candidate.mind.name]")
+		candidates-=candidate
+		infected+=candidate
+		infected_names+="[candidate.mind.assigned_role] [candidate.mind.name]"
 
 	special_orders = list(
 		"Quarantine these personnel: [list2text(infected_names, ", ")].",
@@ -41,5 +41,5 @@ datum/directive/bluespace_contagion/directives_complete()
 	if(!D) return 1
 
 	if(deceased in D.infected)
-		D.infected.Remove(deceased)
+		D.infected-=deceased
 	return 1

code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm

@@ -9,7 +9,7 @@ datum/directive/terminations/financial_crisis/get_crew_to_terminate()
 	var/list/candidates = civilian_positions - "Head of Personnel"
 	for(var/mob/living/carbon/human/H in player_list)
 		if (candidates.Find(H.mind.assigned_role))
-			civilians.Add(H)
+			civilians+=H
 	return civilians
 
 datum/directive/terminations/financial_crisis/get_description()

code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm

@@ -17,21 +17,21 @@ datum/directive/ipc_virus
 		var/list/machines[0]
 		for(var/mob/living/carbon/human/H in player_list)
 			if (H.species.name == "Machine")
-				machines.Add(H)
+				machines+=H
 		return machines
 
 	proc/get_roboticists()
 		var/list/roboticists[0]
 		for(var/mob/living/carbon/human/H in player_list)
 			if (roboticist_roles.Find(H.mind.assigned_role))
-				roboticists.Add(H)
+				roboticists+=H
 		return roboticists
 
 datum/directive/ipc_virus/initialize()
 	for(var/mob/living/carbon/human/H in get_ipcs())
-		brains_to_enslave.Add(H.mind)
-		cyborgs_to_make.Add(H.mind)
-		ids_to_terminate.Add(H.wear_id)
+		brains_to_enslave+=H.mind
+		cyborgs_to_make+=H.mind
+		ids_to_terminate+=H.wear_id
 
 datum/directive/ipc_virus/get_description()
 	return {"
@@ -54,7 +54,7 @@ datum/directive/ipc_virus/directives_complete()
 	if (!D) return 1
 
 	if(D.brains_to_enslave.Find(B.brainmob.mind))
-		D.brains_to_enslave.Remove(B.brainmob.mind)
+		D.brains_to_enslave-=B.brainmob.mind
 
 	return 1
 
@@ -63,13 +63,13 @@ datum/directive/ipc_virus/directives_complete()
 	if (!D) return 1
 
 	if(D.cyborgs_to_make.Find(cyborg.mind))
-		D.cyborgs_to_make.Remove(cyborg.mind)
+		D.cyborgs_to_make-=cyborg.mind
 
 	// In case something glitchy happened and the victim got
 	// borged without us tracking the brain removal, go ahead
 	// and update that list too.
 	if(D.brains_to_enslave.Find(cyborg.mind))
-		D.brains_to_enslave.Remove(cyborg.mind)
+		D.brains_to_enslave-=cyborg.mind
 
 	return 1
 
@@ -78,6 +78,6 @@ datum/directive/ipc_virus/directives_complete()
 	if (!D) return 1
 
 	if(D.ids_to_terminate && D.ids_to_terminate.Find(id))
-		D.ids_to_terminate.Remove(id)
+		D.ids_to_terminate-=id
 
 	return 1

code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm

@@ -8,7 +8,7 @@ datum/directive/research_to_ripleys
 		var/list/researchers[0]
 		for(var/mob/living/carbon/human/H in player_list)
 			if (H.mind.assigned_role in science_positions - "Research Director")
-				researchers.Add(H)
+				researchers+=H
 		return researchers
 
 	proc/count_researchers_reassigned()

code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm

@@ -10,21 +10,21 @@ datum/directive/tau_ceti_needs_women
 		var/list/targets[0]
 		for(var/mob/living/carbon/human/H in player_list)
 			if(H.species.name != "Machine" && H.gender == get_target_gender())
-				targets.Add(H)
+				targets+=H
 		return targets
 
 	proc/get_target_heads()
 		var/list/heads[0]
 		for(var/mob/living/carbon/human/H in get_crew_of_target_gender())
 			if(command_positions.Find(H.mind.assigned_role))
-				heads.Add(H)
+				heads+=H
 		return heads
 
 	proc/get_target_aliens()
 		var/list/aliens[0]
 		for(var/mob/living/carbon/human/H in get_crew_of_target_gender())
 			if (H.species.name == "Tajaran" || H.species.name == "Unathi" || H.species.name == "Skrell")
-				aliens.Add(H)
+				aliens+=H
 		return aliens
 
 	proc/count_heads_reassigned()
@@ -48,7 +48,7 @@ datum/directive/tau_ceti_needs_women/initialize()
 		command_targets[H.wear_id] = 0
 
 	for(var/mob/living/carbon/human/H in get_target_aliens())
-		alien_targets.Add(H.wear_id)
+		alien_targets+=H.wear_id
 
 	special_orders = list(
 		"Remove [get_target_gender()] personnel from Command positions.",
@@ -75,7 +75,7 @@ datum/directive/tau_ceti_needs_women/directives_complete()
 	if (!D) return 1
 
 	if(D.alien_targets && D.alien_targets.Find(id))
-		D.alien_targets.Remove(id)
+		D.alien_targets-=id
 
 	if(D.command_targets && D.command_targets.Find(id))
 		D.command_targets[id] = 1

code/game/gamemodes/mutiny/directives/terminations_directive.dm

@@ -26,7 +26,7 @@ datum/directive/terminations/initialize()
 		var/datum/money_account/account = A.mind.initial_account
 		accounts_to_revoke["[account.account_number]"] = 0
 		accounts_to_suspend["[account.account_number]"] = account.suspended
-		ids_to_terminate.Add(A.wear_id)
+		ids_to_terminate+=A.wear_id
 
 /hook/revoke_payroll/proc/payroll_directive(datum/money_account/account)
 	var/datum/directive/terminations/D = get_directive("terminations")
@@ -51,6 +51,6 @@ datum/directive/terminations/initialize()
 	if (!D) return 1
 
 	if(D.ids_to_terminate && D.ids_to_terminate.Find(id))
-		D.ids_to_terminate.Remove(id)
+		D.ids_to_terminate-=id
 
 	return 1

code/game/gamemodes/mutiny/directives/test_directive.dm

@@ -8,7 +8,7 @@ datum/directive/terminations/test
 datum/directive/terminations/test/get_crew_to_terminate()
 	var/list/uglies[0]
 	for(var/mob/living/carbon/human/H in player_list)
-		uglies.Add(H)
+		uglies+=H
 	return uglies
 
 datum/directive/terminations/test/get_description()

code/game/gamemodes/mutiny/mutiny_hooks.dm

@@ -2,7 +2,7 @@
 	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
 	if (!mode) return 1
 
-	mode.body_count.Add(deceased.mind)
+	mode.body_count+=deceased.mind
 	return 1
 
 /hook/clone/proc/update_icon(mob/living/carbon/human/H)

code/modules/clothing/spacesuits/alien.dm

@@ -194,6 +194,35 @@
 
 
 //Vox Armalis gear.
+//Vox Armalis gear.
+/obj/item/clothing/shoes/magboots/vox/armalis
+ 	name = "large vox magclaws"
+ 	item_state = "boots-armalis"
+ 	icon_state = "boots-armalis"
+ 	icon_override = 'icons/mob/species/vox/armalis/shoes.dmi'
+ 	species_restricted = list("Vox Armalis")
+
+/obj/item/clothing/gloves/yellow/vox/armalis
+ 	name = "large insulated gauntlets"
+ 	item_state = "gloves-armalis"
+ 	icon_state = "gloves-armalis"
+ 	icon_override = 'icons/mob/species/vox/armalis/hands.dmi'
+ 	species_restricted = list("Vox Armalis")
+
+/obj/item/clothing/mask/breath/vox/armalis
+ 	name = "large vox mask"
+ 	item_state = "mask-armalis"
+ 	icon_state = "mask-armalis"
+ 	icon_override = 'icons/mob/species/vox/armalis/mask.dmi'
+ 	species_restricted = list("Vox Armalis")
+
+/obj/item/clothing/suit/space/vox/carapace/armalis
+	name = "large alien carapace armour"
+	item_state = "armour-armalis"
+	icon_state = "armour-armalis"
+	icon_override = 'icons/mob/vox.dmi'
+	species_restricted = list("Vox Armalis")
+
 /obj/item/clothing/suit/space/vox/carapace/armalis
 	name = "large alien carapace armour"
 	item_state = "armour-armalis"

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

@@ -1496,8 +1496,8 @@
 	G.synch()
 
 /mob/living/carbon/human/proc/gut()
-	set category = "IC"
-	set name = "Abilities"
+	set category = "Abilities"
+	set name = "Gut"
 	set desc = "While grabbing someone aggressively, rip their guts out or tear them apart."
 
 	if(last_special > world.time)

code/stylesheet.dm

@@ -59,7 +59,7 @@ h1.alert, h2.alert		{color: #000000;}
 
 .mod					{color: #735638;	font-weight: bold;}
 .modooc					{color: #184880;	font-weight: bold;}
-.adminchat				{color: #9000FF;	font-weight: bold;}
+.adminchat				{color: #9A04D1;	font-weight: bold;}
 .adminmod				{color: #402A14;	font-weight: bold;}
 
 .alien					{color: #543354;}