Merge pull request #9692 from Ghommie/Ghommie-cit309

Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.

code/datums/ruins/lavaland.dm

@@ -163,6 +163,13 @@
 	suffix = "lavaland_surface_xeno_nest.dmm"
 	cost = 20 */
 
+/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
+
 /datum/map_template/ruin/lavaland/fountain
 	name = "Fountain Hall"
 	id = "fountain"

code/modules/cargo/console.dm

@@ -3,6 +3,7 @@
 	desc = "Used to order supplies, approve requests, and control the shuttle."
 	icon_screen = "supply"
 	circuit = /obj/item/circuitboard/computer/cargo
+	req_access = list(ACCESS_CARGO)
 	var/requestonly = FALSE
 	var/contraband = FALSE
 	var/safety_warning = "For safety reasons, the automated supply shuttle \
@@ -17,6 +18,7 @@
 	desc = "Used to request supplies from cargo."
 	icon_screen = "request"
 	circuit = /obj/item/circuitboard/computer/cargo/request
+	req_access = list()
 	requestonly = TRUE
 
 /obj/machinery/computer/cargo/Initialize()
@@ -114,6 +116,9 @@
 /obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui)
 	if(..())
 		return
+	if(!allowed(usr))
+		to_chat(usr, "<span class='notice'>Access denied.</span>")
+		return
 	if(action != "add" && requestonly)
 		return
 	switch(action)

code/modules/power/lighting.dm

@@ -177,8 +177,6 @@
 	fixture_type = "bulb"
 	sheets_refunded = 1
 
-
-
 // the standard tube light fixture
 /obj/machinery/light
 	name = "light fixture"
@@ -197,8 +195,8 @@
 	var/on_gs = FALSE
 	var/static_power_used = 0
 	var/brightness = 8			// luminosity when on, also used in power calculation
-	var/bulb_power = 1			// basically the alpha of the emitted light source
-	var/bulb_colour = "#FFFFFF"	// befault colour of the light.
+	var/bulb_power = 0.75			// basically the alpha of the emitted light source
+	var/bulb_colour = "#FFEEDD"	// befault colour of the light.
 	var/status = LIGHT_OK		// LIGHT_OK, _EMPTY, _BURNED or _BROKEN
 	var/flickering = FALSE
 	var/light_type = /obj/item/light/tube		// the type of light item
@@ -235,6 +233,7 @@
 	base_state = "bulb"
 	fitting = "bulb"
 	brightness = 4
+	bulb_colour = "#FFDDBB"
 	desc = "A small lighting fixture."
 	light_type = /obj/item/light/bulb
 

code/modules/recycling/disposal/bin.dm

@@ -354,6 +354,12 @@
 			. = TRUE
 	ui.soft_update_fields()
 
+/obj/machinery/disposal/bin/alt_attack_hand(mob/user)
+	if(can_interact(usr))
+		flush = !flush
+		update_icon()
+		return TRUE
+	return FALSE
 
 /obj/machinery/disposal/bin/hitby(atom/movable/AM)
 	if(isitem(AM) && AM.CanEnterDisposals())

code/modules/ruins/lavalandruin_code/alien_nest.dm

@@ -1,10 +1,3 @@
-/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
@@ -23,4 +16,4 @@
 	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)
+	list_reagents = list("xenomicrobes" = 1)

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/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/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

tgstation.dme

@@ -2711,6 +2711,7 @@
 #include "code\modules\research\xenobiology\crossbreeding\selfsustaining.dm"
 #include "code\modules\research\xenobiology\crossbreeding\stabilized.dm"
 #include "code\modules\ruins\lavaland_ruin_code.dm"
+#include "code\modules\ruins\lavalandruin_code\alien_nest.dm"
 #include "code\modules\ruins\lavalandruin_code\biodome_clown_planet.dm"
 #include "code\modules\ruins\lavalandruin_code\pizzaparty.dm"
 #include "code\modules\ruins\lavalandruin_code\puzzle.dm"
@@ -3040,7 +3041,6 @@
 #include "modular_citadel\code\modules\arousal\organs\vagina.dm"
 #include "modular_citadel\code\modules\arousal\organs\womb.dm"
 #include "modular_citadel\code\modules\arousal\toys\dildos.dm"
-#include "modular_citadel\code\modules\cargo\console.dm"
 #include "modular_citadel\code\modules\client\client_defines.dm"
 #include "modular_citadel\code\modules\client\client_procs.dm"
 #include "modular_citadel\code\modules\client\preferences.dm"
@@ -3088,7 +3088,6 @@
 #include "modular_citadel\code\modules\mentor\mentorhelp.dm"
 #include "modular_citadel\code\modules\mentor\mentorpm.dm"
 #include "modular_citadel\code\modules\mentor\mentorsay.dm"
-#include "modular_citadel\code\modules\mining\mining_ruins.dm"
 #include "modular_citadel\code\modules\mob\cit_emotes.dm"
 #include "modular_citadel\code\modules\mob\mob.dm"
 #include "modular_citadel\code\modules\mob\living\damage_procs.dm"
@@ -3104,7 +3103,6 @@
 #include "modular_citadel\code\modules\mob\living\silicon\robot\robot.dm"
 #include "modular_citadel\code\modules\mob\living\silicon\robot\robot_modules.dm"
 #include "modular_citadel\code\modules\mob\living\silicon\robot\robot_movement.dm"
-#include "modular_citadel\code\modules\power\lighting.dm"
 #include "modular_citadel\code\modules\projectiles\gun.dm"
 #include "modular_citadel\code\modules\projectiles\ammunition\caseless.dm"
 #include "modular_citadel\code\modules\projectiles\ammunition\ballistic\smg\smg.dm"
@@ -3134,7 +3132,6 @@
 #include "modular_citadel\code\modules\reagents\objects\clothes.dm"
 #include "modular_citadel\code\modules\reagents\objects\items.dm"
 #include "modular_citadel\code\modules\reagents\reagents\cit_reagents.dm"
-#include "modular_citadel\code\modules\recycling\disposal\bin.dm"
 #include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm"
 #include "modular_citadel\interface\skin.dmf"
 // END_INCLUDE