Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

modular_citadel/code/modules/arousal/genitals_sprite_accessories.dm

@@ -30,16 +30,16 @@
 	name = "Tapered"
 
 /datum/sprite_accessory/penis/tentacle
-    icon_state = "tentacle"
-    name = "Tentacled"
+	icon_state = "tentacle"
+	name = "Tentacled"
 
 /datum/sprite_accessory/penis/hemi
-    icon_state = "hemi"
-    name = "Hemi"
+	icon_state = "hemi"
+	name = "Hemi"
 
 /datum/sprite_accessory/penis/hemiknot
-    icon_state = "hemiknot"
-    name = "Knotted Hemi"
+	icon_state = "hemiknot"
+	name = "Knotted Hemi"
 
 
 ////////////////////////
@@ -117,8 +117,8 @@
 	name = "Furred"
 
 /datum/sprite_accessory/vagina/gaping
-    icon_state = "gaping"
-    name = "Gaping"
+	icon_state = "gaping"
+	name = "Gaping"
 
 //BREASTS BE HERE
 /datum/sprite_accessory/breasts

modular_citadel/code/modules/cargo/console.dm

@@ -1,11 +0,0 @@
-/obj/machinery/computer/cargo
-	req_access = list(ACCESS_CARGO)
-
-/obj/machinery/computer/cargo/request
-	req_access = list()
-
-/obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui)
-	if(!allowed(usr))
-		to_chat(usr, "<span class='notice'>Access denied.</span>")
-		return
-	. = ..()

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

@@ -194,28 +194,28 @@
 	ckeywhitelist = list("technicalmagi")
 
 /datum/gear/gladiator
-    name = "Gladiator Armor"
-    category = SLOT_WEAR_SUIT
-    path = /obj/item/clothing/under/gladiator
-    ckeywhitelist = list("aroche")
+	name = "Gladiator Armor"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/under/gladiator
+	ckeywhitelist = list("aroche")
 
 /datum/gear/bloodredtie
-    name = "Blood Red Tie"
-    category = SLOT_NECK
-    path = /obj/item/clothing/neck/tie/bloodred
-    ckeywhitelist = list("kyutness")
+	name = "Blood Red Tie"
+	category = SLOT_NECK
+	path = /obj/item/clothing/neck/tie/bloodred
+	ckeywhitelist = list("kyutness")
 
 /datum/gear/puffydress
-    name = "Puffy Dress"
-    category = SLOT_WEAR_SUIT
-    path = /obj/item/clothing/suit/puffydress
-    ckeywhitelist = list("stallingratt")
+	name = "Puffy Dress"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/puffydress
+	ckeywhitelist = list("stallingratt")
 
 /datum/gear/labredblack
-    name = "Black and Red Coat"
-    category = SLOT_WEAR_SUIT
-    path = /obj/item/clothing/suit/toggle/labcoat/labredblack
-    ckeywhitelist = list("blakeryan", "durandalphor")
+	name = "Black and Red Coat"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/toggle/labcoat/labredblack
+	ckeywhitelist = list("blakeryan", "durandalphor")
 
 /datum/gear/torisword
 	name = "Rainbow Zweihander"

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

@@ -4,6 +4,20 @@
 	path = /obj/item/clothing/under/color/grey
 	restricted_roles = list("Assistant")
 
+/datum/gear/neetsuit
+	name = "ASSU suit"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/assu_suit
+	restricted_roles = list("Assistant")
+	cost = 2
+
+/datum/gear/neethelm
+	name = "ASSU helmet"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/assu_helmet
+	restricted_roles = list("Assistant")
+	cost = 2
+
 /datum/gear/plushvar
 	name = "Ratvar Plushie"
 	category = SLOT_IN_BACKPACK
@@ -16,4 +30,4 @@
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/toy/plush/narplush
 	cost = 5
-	restricted_roles = list("Chaplain")
+	restricted_roles = list("Chaplain")

modular_citadel/code/modules/mentor/mentor_verbs.dm

@@ -1,8 +1,8 @@
-GLOBAL_PROTECT(mentor_verbs)
 GLOBAL_LIST_INIT(mentor_verbs, list(
 	/client/proc/cmd_mentor_say,
 	/client/proc/show_mentor_memo
 	))
+GLOBAL_PROTECT(mentor_verbs)
 
 /client/proc/add_mentor_verbs()
 	if(mentor_datum)

modular_citadel/code/modules/mining/mining_ruins.dm

@@ -1,26 +0,0 @@
-/datum/map_template/ruin/lavaland/alien_nest
-	name = "Alien Nest"
-	id = "alien-nest"
-	description = "Not even Necropolis is safe from alien infestation. The competition for hosts has locked the legion and aliens in an endless conflict that can only be resolved by a PKA."
-	suffix = "lavaland_surface_alien_nest.dmm"
-	cost = 20
-
-//Aliens for the alien nest space ruin.
-/obj/effect/mob_spawn/alien/corpse/humanoid/drone
-	mob_type = /mob/living/carbon/alien/humanoid/drone
-	death = TRUE
-	name = "alien drone"
-	mob_name = "alien drone"
-
-/obj/effect/mob_spawn/alien/corpse/humanoid/queen
-	mob_type = /mob/living/carbon/alien/humanoid/royal/queen
-	death = TRUE
-	name = "alien queen"
-	mob_name = "alien queen"
-
-/obj/item/reagent_containers/syringe/alien
-	name = "Hive's Blessing"
-	desc = "A syringe filled with a strange viscous liquid. It might be best to leave it alone."
-	amount_per_transfer_from_this = 1
-	volume = 1
-	list_reagents = list("xenomicrobes" = 1)

modular_citadel/code/modules/power/lighting.dm

@@ -1,7 +0,0 @@
-/obj/machinery/light
-	bulb_colour = "#FFEEDD"
-	bulb_power = 0.75
-
-/obj/machinery/light/small
-	bulb_colour = "#FFDDBB"
-	bulb_power = 0.75

modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm

@@ -29,27 +29,27 @@
 	build_path = /obj/item/ammo_box/magazine/m10mm/hp
 	category = list("Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
- 
- /datum/design/m10mm/ap
- 	name = "pistol magazine (10mm AP)"
- 	desc = "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
- 	id = "10mmap"
- 	build_type = PROTOLATHE
- 	materials = list(MAT_METAL = 40000, MAT_TITANIUM = 60000)
- 	build_path = /obj/item/ammo_box/magazine/m10mm/ap
- 	category = list("Ammo")
- 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-	
+
+/datum/design/m10mm/ap
+	name = "pistol magazine (10mm AP)"
+	desc = "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
+	id = "10mmap"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 40000, MAT_TITANIUM = 60000)
+	build_path = /obj/item/ammo_box/magazine/m10mm/ap
+	category = list("Ammo")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
 /datum/design/bolt_clip
- 	name = "Surplus Rifle Clip"
- 	desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds."
- 	id = "bolt_clip"
- 	build_type = PROTOLATHE
- 	materials = list(MAT_METAL = 8000)
- 	build_path = /obj/item/ammo_box/a762
- 	category = list("Ammo")
- 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
- 
+	name = "Surplus Rifle Clip"
+	desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds."
+	id = "bolt_clip"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 8000)
+	build_path = /obj/item/ammo_box/a762
+	category = list("Ammo")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
 /datum/design/m45 //Kinda NT in throey
 	name = "handgun magazine (.45)"
 	id = "m45"

modular_citadel/code/modules/projectiles/guns/ballistic/revolver.dm

@@ -1,11 +0,0 @@
-/*
-//	REVOLVER THINGS GO HERE
-*/
-
-/obj/item/gun/ballistic/revolver		//regular, classic sprite
-	name = "\improper .357 revolver"
-	desc = "A typical revolver. Uses .357 ammo."
-
-/obj/item/gun/ballistic/revolver/syndie		//New and improved 100% syndicate technology!
-	desc = "A suspicious revolver. Uses .357 ammo."
-	icon = 'modular_citadel/icons/obj/guns/revolver.dmi'

modular_citadel/code/modules/projectiles/projectiles/reusable.dm

@@ -1,6 +1,6 @@
 /obj/item/projectile/bullet/reusable/foam_dart/tag
-  name = "lastag foam dart"
-  var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
+	  name = "lastag foam dart"
+	  var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
 
 /obj/item/projectile/bullet/reusable/foam_dart/tag/on_hit(atom/target, blocked = FALSE)
 	. = ..()

modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm

@@ -6,6 +6,7 @@
 	id = "fermi"
 	taste_description	= "affection and love!"
 	can_synth = FALSE
+	value = 20
 	//SplitChem = TRUE
 	impure_chem 			= "fermiTox"// What chemical is metabolised with an inpure reaction
 	inverse_chem_val 		= 0.25		// If the impurity is below 0.5, replace ALL of the chem with inverse_chemupon metabolising
@@ -178,6 +179,7 @@
 	inverse_chem		= "nanite_b_goneTox" //At really impure vols, it just becomes 100% inverse
 	taste_description = "what can only be described as licking a battery."
 	pH = 9
+	value = 90
 	can_synth = FALSE
 
 /datum/reagent/fermi/nanite_b_gone/on_mob_life(mob/living/carbon/C)

modular_citadel/code/modules/reagents/reagents/cit_reagents.dm

@@ -114,8 +114,8 @@
 	name = "Hexacrocin"
 	id = "aphro+"
 	description = "Chemically condensed form of basic crocin. This aphrodisiac is extremely powerful and addictive in most animals.\
-					Addiction withdrawals can cause brain damage and shortness of breath. Overdosage can lead to brain damage and a\
-					 permanent increase in libido (commonly referred to as 'bimbofication')."
+					Addiction withdrawals can cause brain damage and shortness of breath. Overdosage can lead to brain damage and a \
+					permanent increase in libido (commonly referred to as 'bimbofication')."
 	taste_description = "liquid desire"
 	color = "#FF2BFF"//dark pink
 	addiction_threshold = 20

modular_citadel/code/modules/recycling/disposal/bin.dm

@@ -1,6 +0,0 @@
-/obj/machinery/disposal/bin/alt_attack_hand(mob/user)
-	if(can_interact(usr))
-		flush = !flush
-		update_icon()
-		return TRUE
-	return FALSE

modular_citadel/code/modules/research/designs/autoylathe_designs.dm

@@ -1,63 +1,63 @@
 /datum/design/autoylathe
-  build_type = AUTOYLATHE
+	build_type = AUTOYLATHE
 
 /datum/design/autoylathe/mech
-  category = list("initial", "Figurines")
+	category = list("initial", "Figurines")
 
 /datum/design/autoylathe/mech/contraband
-  category = list("hacked", "Figurines")
+	category = list("hacked", "Figurines")
 
 /datum/design/autoylathe/figure
-  category = list("initial", "Figurines")
+	category = list("initial", "Figurines")
 
 /datum/design/autoylathe/balloon
-  name = "Empty Water balloon"
-  id = "waterballoon"
-  materials = list(MAT_PLASTIC = 50)
-  build_path = /obj/item/toy/balloon
-  category = list("initial", "Toys")
+	name = "Empty Water balloon"
+	id = "waterballoon"
+	materials = list(MAT_PLASTIC = 50)
+	build_path = /obj/item/toy/balloon
+	category = list("initial", "Toys")
 
 /datum/design/autoylathe/spinningtoy
-  name = "Toy Singularity"
-  id = "singuloutoy"
-  materials = list(MAT_PLASTIC = 500)
-  build_path = /obj/item/toy/spinningtoy
-  category = list("initial", "Toys")
+	name = "Toy Singularity"
+	id = "singuloutoy"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/spinningtoy
+	category = list("initial", "Toys")
 
 /datum/design/autoylathe/capgun
-  name = "Cap Gun"
-  id = "capgun"
-  materials = list(MAT_PLASTIC = 500)
-  build_path = /obj/item/toy/gun
-  category = list("initial", "Pistols")
+	name = "Cap Gun"
+	id = "capgun"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/gun
+	category = list("initial", "Pistols")
 
 /datum/design/autoylathe/capgunammo
-  name = "Capgun Ammo"
-  id = "capgunammo"
-  materials = list(MAT_PLASTIC = 50)
-  build_path = /obj/item/toy/ammo/gun
-  category = list("initial", "misc")
+	name = "Capgun Ammo"
+	id = "capgunammo"
+	materials = list(MAT_PLASTIC = 50)
+	build_path = /obj/item/toy/ammo/gun
+	category = list("initial", "misc")
 
 /datum/design/autoylathe/toysword
-  name = "Toy Sword"
-  id = "toysword"
-  materials = list(MAT_PLASTIC = 500)
-  build_path = /obj/item/toy/sword
-  category = list("initial", "Melee")
+	name = "Toy Sword"
+	id = "toysword"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/sword
+	category = list("initial", "Melee")
 
 /datum/design/autoylathe/foamblade
-  name = "Foam Armblade"
-  id = "foamblade"
-  materials = list(MAT_PLASTIC = 500)
-  build_path = /obj/item/toy/foamblade
-  category = list("initial", "Melee")
+	name = "Foam Armblade"
+	id = "foamblade"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/foamblade
+	category = list("initial", "Melee")
 
 /datum/design/autoylathe/windupbox
-  name = "Wind Up Toolbox"
-  id = "windupbox"
-  materials = list(MAT_PLASTIC = 500)
-  build_path = /obj/item/toy/windupToolbox
-  category = list("initial", "Toys")
+	name = "Wind Up Toolbox"
+	id = "windupbox"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/windupToolbox
+	category = list("initial", "Toys")
 
 /datum/design/autoylathe/toydualsword
 	name = "Double-Bladed Toy Sword"
@@ -456,11 +456,11 @@
 	category = list("hacked", "Figurines")
 
 /datum/design/autoylathe/figure/wizard
-  name = "Wizard"
-  id = "wizfigure"
-  materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
-  build_path = /obj/item/toy/figure/wizard
-  category = list("hacked", "Figurines")
+	name = "Wizard"
+	id = "wizfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/wizard
+	category = list("hacked", "Figurines")
 
 /datum/design/autoylathe/dildo
 	name = "Customizable Dildo"
@@ -521,23 +521,25 @@
 //because why not make a boxed kit with all of the lastag shit?
 /obj/item/storage/box/blueteam
 	name = "Blue Team Kit"
+
 /obj/item/storage/box/blueteam/PopulateContents()
-  new /obj/item/clothing/head/helmet/bluetaghelm(src)
-  new /obj/item/clothing/suit/bluetag(src)
-  new /obj/item/gun/energy/laser/bluetag(src)
-  new /obj/item/clothing/gloves/color/blue(src)
-  new /obj/item/clothing/shoes/sneakers/blue(src)
-  new /obj/item/clothing/under/color/blue(src)
+	new /obj/item/clothing/head/helmet/bluetaghelm(src)
+	new /obj/item/clothing/suit/bluetag(src)
+	new /obj/item/gun/energy/laser/bluetag(src)
+	new /obj/item/clothing/gloves/color/blue(src)
+	new /obj/item/clothing/shoes/sneakers/blue(src)
+	new /obj/item/clothing/under/color/blue(src)
 
 /obj/item/storage/box/redteam
 	name = "Red Team Kit"
+
 /obj/item/storage/box/redteam/PopulateContents()
-  new /obj/item/clothing/head/helmet/redtaghelm(src)
-  new /obj/item/clothing/suit/redtag(src)
-  new /obj/item/gun/energy/laser/redtag(src)
-  new /obj/item/clothing/gloves/color/red(src)
-  new /obj/item/clothing/shoes/sneakers/red(src)
-  new /obj/item/clothing/under/color/red(src)
+	new /obj/item/clothing/head/helmet/redtaghelm(src)
+	new /obj/item/clothing/suit/redtag(src)
+	new /obj/item/gun/energy/laser/redtag(src)
+	new /obj/item/clothing/gloves/color/red(src)
+	new /obj/item/clothing/shoes/sneakers/red(src)
+	new /obj/item/clothing/under/color/red(src)
 
 /datum/design/autoylathe/lastag/blue
 	name = "Blue Lasertag Kit"