Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

code/modules/power/singularity/containment_field.dm

@@ -3,7 +3,11 @@
 /obj/machinery/field/containment
 	name = "containment field"
 	desc = "An energy field."
+<<<<<<< HEAD
 	icon = 'icons/obj/machines/engine/singularity.dmi' // SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE
+=======
+	icon = 'icons/obj/machines/engine/singularity.dmi'
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	icon_state = "Contain_F"
 	density = FALSE
 	move_resist = INFINITY

code/modules/power/singularity/emitter.dm

@@ -1,7 +1,11 @@
 /obj/machinery/power/emitter
 	name = "emitter"
 	desc = "A heavy-duty industrial laser, often used in containment fields and power generation."
+<<<<<<< HEAD
 	icon = 'icons/obj/machines/engine/singularity.dmi' //SKYRAT EDIT CHANGE - ICON OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE
+=======
+	icon = 'icons/obj/machines/engine/singularity.dmi'
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	icon_state = "emitter"
 	base_icon_state = "emitter"
 
@@ -352,8 +356,11 @@
 /obj/machinery/power/emitter/proc/integrate(obj/item/gun/energy/energy_gun, mob/user)
 	if(!istype(energy_gun, /obj/item/gun/energy))
 		return
+<<<<<<< HEAD
 	if(istype(energy_gun, /obj/item/gun/energy/cell_loaded))//SKYRAT EDIT MEDIGUNS
 		return //SKYRAT EDIT END
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	if(!user.transferItemToLoc(energy_gun, src))
 		return
 	gun = energy_gun
@@ -423,7 +430,11 @@
 	. = ..()
 
 /obj/machinery/power/emitter/prototype/user_buckle_mob(mob/living/buckled_mob, mob/user, check_loc = TRUE)
+<<<<<<< HEAD
 	if(user.incapacitated() || !istype(user))
+=======
+	if(user.incapacitated || !istype(user))
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 		return
 	for(var/atom/movable/atom in get_turf(src))
 		if(atom.density && (atom != src && atom != buckled_mob))

code/modules/power/singularity/narsie.dm

@@ -276,7 +276,11 @@
 
 ///security level and shuttle lockdowns for [/proc/begin_the_end()]
 /proc/narsie_start_destroy_station()
+<<<<<<< HEAD
 	SSsecurity_level.set_level(SEC_LEVEL_GAMMA) //SKYRAT EDIT CHANGE - ALERTS - ORIGINAL "delta"
+=======
+	SSsecurity_level.set_level(SEC_LEVEL_DELTA)
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	SSshuttle.registerHostileEnvironment(GLOB.cult_narsie)
 	SSshuttle.lockdown = TRUE
 	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_apocalypse)), 1 MINUTES)