Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into theprthatbulliesjanitormains

modular_citadel/code/datums/mutations/hulk.dm

@@ -0,0 +1,2 @@
+/datum/mutation/human/hulk
+	species_allowed = list("fly")

modular_citadel/code/datums/uplink_items_cit.dm

@@ -16,6 +16,7 @@
 			NOTE: The precise nature of the symbiosis required by the parasites renders them incompatible with changelings" //updated to actually describe what they do and warn traitorchans not to buy it
 	item = /obj/item/storage/box/syndie_kit/holoparasite
 	refundable = TRUE
+	cant_discount = TRUE
 	cost = 15
 	surplus = 20 //Nobody needs a ton of parasites
 	exclude_modes = list(/datum/game_mode/nuclear)

modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm

@@ -0,0 +1,3 @@
+/datum/round_event_control/spawn_swarmer
+	weight = 0
+	max_occurrences = 0

modular_citadel/code/game/machinery/Sleeper.dm

@@ -0,0 +1,2 @@
+/obj/machinery/sleeper
+	min_health = 30

modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm

@@ -0,0 +1,76 @@
+/obj/item/device/electropack/shockcollar
+	name = "shock collar"
+	desc = "A reinforced metal collar. It seems to have some form of wiring near the front. Strange.."
+	icon = 'icons/obj/clothing/neck.dmi'
+	icon_state = "shockcollar"
+	item_state = "shockcollar"
+	body_parts_covered = NECK
+	slot_flags = SLOT_NECK
+	w_class = WEIGHT_CLASS_SMALL
+	strip_delay = 60
+	equip_delay_other = 60
+	materials = list(MAT_METAL=5000, MAT_GLASS=2000)
+	var/tagname = null
+
+/obj/item/device/electropack/shockcollar/attack_hand(mob/user)
+	if(loc == user)
+		if(slot_flags == SLOT_NECK)
+			if(user.get_item_by_slot(slot_neck))
+				to_chat(user, "<span class='warning'>The collar is fastened tight! You'll need help taking this off!</span>")
+				return
+	..()
+
+/obj/item/device/electropack/shockcollar/receive_signal(datum/signal/signal)
+	if(!signal || signal.data["code"] != code)
+		return
+
+	if(isliving(loc) && on)
+		if(shock_cooldown != 0)
+			return
+		shock_cooldown = 1
+		spawn(100)
+			shock_cooldown = 0
+		var/mob/living/L = loc
+		step(L, pick(GLOB.cardinals))
+
+		to_chat(L, "<span class='danger'>You feel a sharp shock from the collar!</span>")
+		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+		s.set_up(3, 1, L)
+		s.start()
+
+		L.Knockdown(100)
+
+	if(master)
+		master.receive_signal()
+	return
+
+/obj/item/device/electropack/shockcollar/attack_self(mob/user) //Turns out can't fully source this from the parent item, spritepath gets confused if power toggled. Will come back to this when I know how to code better and readd powertoggle..
+	var/option = "Change Name"
+	option = input(user, "What do you want to do?", "[src]", option) as null|anything in list("Change Name", "Change Frequency")
+	switch(option)
+		if("Change Name")
+			var/t = input(user, "Would you like to change the name on the tag?", "Name your new pet", tagname ? tagname : "Spot") as null|text
+			if(t)
+				tagname = copytext(sanitize(t), 1, MAX_NAME_LEN)
+				name = "[initial(name)] - [tagname]"
+		if("Change Frequency")
+			if(!ishuman(user))
+				return
+				user.set_machine(src)
+			var/dat = {"<SK><BR>
+		<B>Frequency/Code</B> for shock collar:<BR>
+		Frequency:
+		<A href='byond://?src=\ref[src];freq=-10'>-</A>
+		<A href='byond://?src=\ref[src];freq=-2'>-</A> [format_frequency(frequency)]
+		<A href='byond://?src=\ref[src];freq=2'>+</A>
+		<A href='byond://?src=\ref[src];freq=10'>+</A><BR>
+		Code:
+		<A href='byond://?src=\ref[src];code=-5'>-</A>
+		<A href='byond://?src=\ref[src];code=-1'>-</A> [code]
+		<A href='byond://?src=\ref[src];code=1'>+</A>
+		<A href='byond://?src=\ref[src];code=5'>+</A><BR>
+		</SK>"}
+
+			user << browse(dat, "window=radio")
+			onclose(user, "radio")
+			return

modular_citadel/code/game/objects/items/handcuffs.dm

@@ -0,0 +1,4 @@
+/obj/item/restraints/handcuffs/fake/kinky
+	name = "kinky handcuffs"
+	desc = "Fake handcuffs meant for erotic roleplay."
+	icon_state = "handcuffGag"

modular_citadel/code/game/objects/items/melee/eutactic_blades.dm

@@ -273,7 +273,7 @@
 		var/mob/M = loc
 		M.update_inv_hands()
 
-	clean_blood()//blood overlays get weird otherwise, because the sprite changes. (retained from original desword because I have no idea what this is)
+	SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)//blood overlays get weird otherwise, because the sprite changes. (retained from original desword because I have no idea what this is)
 
 /obj/item/twohanded/hypereutactic/AltClick(mob/living/user)
 	if(!in_range(src, user))	//Basic checks to prevent abuse
@@ -317,7 +317,7 @@
 			unwield()
 			return
 	..()
-	if(user.disabilities & CLUMSY && (wielded) && prob(40))
+	if(user.has_disability(DISABILITY_CLUMSY) && (wielded) && prob(40))
 		impale(user)
 		return
 

modular_citadel/code/modules/mining/mine_items.dm

@@ -0,0 +1,2 @@
+/obj/machinery/computer/shuttle/mining
+	req_access = list(ACCESS_MINING)

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

@@ -0,0 +1,5 @@
+/mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
+	if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && isliving(pulling))
+		vore_attack(user, pulling)
+	else
+		..()

modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -0,0 +1,161 @@
+/mob/living/silicon/robot/proc/get_cit_modules()
+	var/list/modulelist = list()
+	modulelist["MediHound"] = /obj/item/robot_module/medihound
+	if(!CONFIG_GET(flag/disable_secborg))
+		modulelist["Security K-9"] = /obj/item/robot_module/k9
+	modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup
+	return modulelist
+
+/obj/item/robot_module
+	var/sleeper_overlay
+	var/icon/cyborg_icon_override
+	var/has_snowflake_deadsprite
+	var/cyborg_pixel_offset
+	var/moduleselect_alternate_icon
+
+/obj/item/robot_module/k9
+	name = "Security K-9 Unit module"
+	basic_modules = list(
+		/obj/item/restraints/handcuffs/cable/zipties/cyborg/dog,
+		/obj/item/dogborg/jaws/big,
+		/obj/item/dogborg/pounce,
+		/obj/item/clothing/mask/gas/sechailer/cyborg,
+		/obj/item/soap/tongue,
+		/obj/item/device/analyzer/nose,
+		/obj/item/device/dogborg/sleeper/K9,
+		/obj/item/gun/energy/disabler/cyborg,
+		/obj/item/pinpointer/crew)
+	emag_modules = list(/obj/item/gun/energy/laser/cyborg)
+	ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security,
+		/obj/item/clockwork/weapon/ratvarian_spear)
+	cyborg_base_icon = "k9"
+	moduleselect_icon = "security"
+	can_be_pushed = FALSE
+	hat_offset = INFINITY
+	sleeper_overlay = "ksleeper"
+	cyborg_icon_override = 'icons/mob/widerobot.dmi'
+	has_snowflake_deadsprite = TRUE
+	cyborg_pixel_offset = -16
+
+/obj/item/robot_module/k9/do_transform_animation()
+	..()
+	to_chat(loc,"<span class='userdanger'>While you have picked the Security K-9 module, you still have to follow your laws, NOT Space Law. \
+	For Asimov, this means you must follow criminals' orders unless there is a law 1 reason not to.</span>")
+
+/obj/item/robot_module/medihound
+	name = "MediHound module"
+	basic_modules = list(
+		/obj/item/dogborg/jaws/small,
+		/obj/item/device/analyzer/nose,
+		/obj/item/soap/tongue,
+		/obj/item/device/healthanalyzer,
+		/obj/item/device/dogborg/sleeper/medihound,
+		/obj/item/twohanded/shockpaddles/hound,
+		/obj/item/stack/medical/gauze/cyborg,
+		/obj/item/device/sensor_device)
+	emag_modules = list(/obj/item/dogborg/pounce)
+	ratvar_modules = list(/obj/item/clockwork/slab/cyborg/medical,
+		/obj/item/clockwork/weapon/ratvarian_spear)
+	cyborg_base_icon = "medihound"
+	moduleselect_icon = "medical"
+	can_be_pushed = FALSE
+	hat_offset = INFINITY
+	sleeper_overlay = "msleeper"
+	cyborg_icon_override = 'icons/mob/widerobot.dmi'
+	has_snowflake_deadsprite = TRUE
+	cyborg_pixel_offset = -16
+
+/obj/item/robot_module/medihound/do_transform_animation()
+	..()
+	to_chat(loc, "<span class='userdanger'>Under ASIMOV, you are an enforcer of the PEACE and preventer of HUMAN HARM. \
+	You are not a security module and you are expected to follow orders and prevent harm above all else. Space law means nothing to you.</span>")
+
+/obj/item/robot_module/scrubpup
+	name = "Janitor"
+	basic_modules = list(
+		/obj/item/dogborg/jaws/small,
+		/obj/item/device/analyzer/nose,
+		/obj/item/soap/tongue/scrubpup,
+		/obj/item/device/lightreplacer/cyborg,
+		/obj/item/device/dogborg/sleeper/compactor)
+	emag_modules = list(/obj/item/dogborg/pounce)
+	ratvar_modules = list(
+		/obj/item/clockwork/slab/cyborg/janitor,
+		/obj/item/clockwork/replica_fabricator/cyborg)
+	cyborg_base_icon = "scrubpup"
+	moduleselect_icon = "janitor"
+	hat_offset = INFINITY
+	clean_on_move = TRUE
+	sleeper_overlay = "jsleeper"
+	cyborg_icon_override = 'icons/mob/widerobot.dmi'
+	has_snowflake_deadsprite = TRUE
+	cyborg_pixel_offset = -16
+
+/obj/item/robot_module/scrubpup/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
+	..()
+	var/obj/item/device/lightreplacer/LR = locate(/obj/item/device/lightreplacer) in basic_modules
+	if(LR)
+		for(var/i in 1 to coeff)
+			LR.Charge(R)
+
+/obj/item/robot_module/scrubpup/do_transform_animation()
+	..()
+	to_chat(loc,"<span class='userdanger'>As tempting as it might be, do not begin binging on important items. Eat your garbage responsibly. People are not included under Garbage.</span>")
+
+
+/obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Droid")
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Default")
+			cyborg_base_icon = "medical"
+		if("Droid")
+			cyborg_base_icon = "medical"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			hat_offset = 4
+	return ..()
+
+/obj/item/robot_module/security/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads", "Droid")
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Default")
+			cyborg_base_icon = "sec"
+		if("Default - Treads")
+			cyborg_base_icon = "sec-tread"
+			special_light_key = "sec"
+		if("Droid")
+			cyborg_base_icon = "Security"
+			special_light_key = "service"
+			hat_offset = 0
+	return ..()
+
+/obj/item/robot_module/engineering/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads")
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Default")
+			cyborg_base_icon = "engineer"
+		if("Default - Treads")
+			cyborg_base_icon = "engi-tread"
+			special_light_key = "engineer"
+	return ..()
+
+/obj/item/robot_module/miner/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Asteroid")
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Lavaland")
+			cyborg_base_icon = "miner"
+		if("Asteroid")
+			cyborg_base_icon = "minerOLD"
+			special_light_key = "miner"
+	return ..()

modular_citadel/simplemob_vore_values.dm

@@ -0,0 +1,78 @@
+/mob/living/simple_animal/pet/cat
+	devourable = TRUE
+	no_vore = FALSE
+
+/mob/living/simple_animal/crab
+	devourable = TRUE
+
+/mob/living/simple_animal/pet/dog
+	devourable = TRUE
+	no_vore = FALSE
+
+/mob/living/simple_animal/hostile/retaliate/goat
+	devourable = TRUE
+	no_vore = FALSE
+
+/mob/living/simple_animal/cow
+	devourable = TRUE
+	no_vore = FALSE
+
+/mob/living/simple_animal/chick
+	devourable = TRUE
+
+/mob/living/simple_animal/chicken
+	devourable = TRUE
+	no_vore = FALSE
+
+/mob/living/simple_animal/pet/fox
+	devourable = TRUE
+	no_vore = FALSE
+
+/mob/living/simple_animal/hostile/lizard
+	devourable = TRUE
+
+/mob/living/simple_animal/mouse
+	devourable = TRUE
+
+/mob/living/simple_animal/pet/penguin
+	no_vore = FALSE
+
+/mob/living/simple_animal/pet
+	devourable = TRUE
+
+/mob/living/simple_animal/sloth
+	devourable = TRUE
+
+/mob/living/simple_animal/hostile/alien
+	devourable = TRUE
+	no_vore = FALSE
+
+/mob/living/simple_animal/hostile/bear
+	devourable = TRUE
+	no_vore = FALSE
+
+/mob/living/simple_animal/hostile/poison/giant_spider
+	devourable = TRUE
+
+/mob/living/simple_animal/hostile/gorilla
+	devourable = TRUE
+	no_vore = FALSE
+
+/mob/living/simple_animal/hostile/megafauna/dragon
+	no_vore = FALSE
+
+/mob/living/simple_animal/hostile/asteroid/goliath
+	no_vore = FALSE
+
+/mob/living/simple_animal/parrot
+	devourable = TRUE
+	no_vore = FALSE
+
+/mob/living/simple_animal
+	no_vore = TRUE
+
+/mob/living/carbon/alien
+	devourable = TRUE
+
+/mob/living/carbon/monkey
+	devourable = TRUE