Merge pull request #8 from SimplySable/master

Bad Dog! (Dogborg Removal and other delights)

README.md

@@ -1,14 +1,13 @@
-## Hyper Station 13
+## Gain Station 13
 
-Based and maintained from Citadel Station.
+Based and maintained from Citadel Station, Hyperstation, and others. 
+
+Discord: [Here](https://discord.gg/s9ZSjSbf)
 
 ## Warning you will need Byond Compiler [513.1525] or higher to compile the source code.
 
 [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 
-[![Krihelimeter](http://www.krihelinator.xyz/badge/quotefox/Hyper-Station-13)](http://www.krihelinator.xyz)
-
-[![Percentage of issues still open](http://isitmaintained.com/badge/open/quotefox/Hyper-Station-13.svg)](http://isitmaintained.com/project/quotefox/Hyper-Station-13 "Percentage of issues still open") [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/quotefox/Hyper-Station-13.svg)](http://isitmaintained.com/project/quotefox/Hyper-Station-13 "Average time to resolve an issue")
 
 **Hyper Station Information**  
 **Website:** http://hyperstation13.com  

code/game/objects/items/robot/robot_upgrades.dm

@@ -415,9 +415,9 @@
 	icon_state = "cyborg_upgrade3"
 	require_module = 1
 	module_type = list(
-		/obj/item/robot_module/medical,
-		/obj/item/robot_module/medihound)
-	
+		/obj/item/robot_module/medical) //had to move parantheses to close the list argument not inluding the medhihound here.
+		// /obj/item/robot_module/medihound //Removes the Medihound hypospray upgrade
+
 	var/list/additional_reagents = list()
 
 /obj/item/borg/upgrade/hypospray/action(mob/living/silicon/robot/R, user = usr)
@@ -502,8 +502,8 @@
 	icon_state = "cyborg_upgrade3"
 	require_module = 1
 	module_type = list(
-		/obj/item/robot_module/medical,
-		/obj/item/robot_module/medihound)
+		/obj/item/robot_module/medical) //Had to close list parantheses here to not include medihound
+		///obj/item/robot_module/medihound //Removes Medihound surgical processor upgrade
 
 /obj/item/borg/upgrade/processor/action(mob/living/silicon/robot/R, user = usr)
 	. = ..()
@@ -525,8 +525,8 @@
 	icon_state = "cyborg_upgrade3"
 	require_module = 1
 	module_type = list(
-		/obj/item/robot_module/medical,
-		/obj/item/robot_module/medihound)
+		/obj/item/robot_module/medical) //Closed list parantheses again to not include Medihound
+		///obj/item/robot_module/medihound
 
 
 /obj/item/borg/upgrade/advhealth/action(mob/living/silicon/robot/R, user = usr)

modular_citadel/code/modules/arousal/organs/belly.dm

@@ -2,7 +2,7 @@
 	name 					= "belly"
 	desc 					= "You see a belly on their midsection."
 	icon_state 				= "belly"
-	icon 					= 'modular_citadel/icons/obj/genitals/breasts.dmi'
+	icon 					= 'hyperstation/icons/obj/genitals/belly.dmi'
 	zone 					= "chest"
 	slot 					= "belly"
 	w_class 				= 3

modular_citadel/code/modules/arousal/toys/dildos.dm

@@ -33,6 +33,8 @@
 			sizeword = "huge "
 		if(5)
 			sizeword = "gigantic "
+		if(6)
+			sizeword = "herculean "
 
 	name = "[sizeword][dildo_shape] [can_customize ? "custom " : ""][dildo_type]"
 
@@ -129,6 +131,13 @@ obj/item/dildo/flared/gigantic
 	desc 				= "You can barely carry this thing! Meant for... \"advanced\" interrogation techniques."
 	dildo_size 			= 5
 	attack_verb 		= list("penetrated", "slapped", "gaped", "prolapsed", "inseminated", "destroyed", "broke", "demolished", "whacked")
+//killerdildokillerdildo
+obj/item/dildo/flared/killer
+	name 				= "bitch killer"
+	desc 				= "The fact you're able to carry this is insane. Initally made to be used as a new death penalty, Using this will definitely kill you."
+	dildo_size 			= 6
+	attack_verb 		= list("penetrated", "beat", "gaped", "prolapsed", "destroyed", "broke", "demolished", "whacked", "bruised", "tore")
+
 
 obj/item/dildo/custom
 	name 				= "customizable dildo"
@@ -138,6 +147,7 @@ obj/item/dildo/custom
 	random_shape 		= TRUE
 	random_size 		= TRUE
 
+
 // Suicide acts, by request
 
 /obj/item/dildo/proc/manual_suicide(mob/living/user)
@@ -173,4 +183,16 @@ obj/item/dildo/custom
 		user.adjust_eye_damage(20)
 		user.adjustOxyLoss(15)
 	return MANUAL_SUICIDE
-
+// Two tries, then you're dead bud.
+/obj/item/dildo/flared/killer/suicide_act(mob/living/user)
+	if(do_after(user,45,target=src))
+		user.visible_message("<span class='suicide'>[user] screams in pain as they insert the [src] into their ass! WHY WOULD THEY DO THAT? It looks like [user.p_theyre()] trying to commit suicide!!</span>")
+		playsound(loc, 'sound/voice/scream/scream_r.ogg', 50, 2, -1)
+		playsound(loc, 'sound/lewd/champ_fingering.ogg', 50, 2, -1)
+		playsound(loc, 'sound/effects/gib_step.ogg', 50, 2, -1)
+		user.mob_climax(forced_climax=TRUE)
+		user.Stun(300)
+		user.adjust_blurriness(24)
+		user.adjustBruteLoss(85)
+		user.adjustOxyLoss(20)
+	return MANUAL_SUICIDE

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

@@ -1,3 +1,4 @@
+/*
 /mob/living/silicon/robot/modules/medihound
 	set_module = /obj/item/robot_module/medihound
 
@@ -9,14 +10,15 @@
 
 /mob/living/silicon/robot/modules/borgi
 	set_module = /obj/item/robot_module/borgi
+*/ //I don't know what removing this does but I don't like it (I think this disables turning someone into a dogborg)
 
 /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
-	modulelist["Borgi"] = /obj/item/robot_module/borgi
+	//modulelist["MediHound"] = /obj/item/robot_module/medihound //removes the Medihound Call code
+	//if(!CONFIG_GET(flag/disable_secborg))
+		//modulelist["Security K-9"] = /obj/item/robot_module/k9 //removes Secborg call code?
+	//modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup //removes the scrubpup call code
+	//modulelist["Borgi"] = /obj/item/robot_module/borgi //removes the borgi callcode
 	return modulelist
 
 /obj/item/robot_module
@@ -39,7 +41,7 @@
 	if(user.incapacitated() || !user.Adjacent(src))
 		return FALSE
 	return TRUE
-
+/*
 /obj/item/robot_module/k9
 	name = "Security K-9 Unit"
 	basic_modules = list(
@@ -103,8 +105,8 @@
 			special_light_key = "alina"
 			sleeper_overlay = "alinasleeper"
 	return ..()
-
-/obj/item/robot_module/medihound
+*/ //removes Security K9
+/* /obj/item/robot_module/medihound
 	name = "MediHound"
 	basic_modules = list(
 		/obj/item/assembly/flash/cyborg,
@@ -178,8 +180,8 @@
 			special_light_key = "alina"
 			sleeper_overlay = "alinasleeper"
 	return ..()
-
-/obj/item/robot_module/scrubpup
+*/ // Removes the Mediborg Selection code
+/* /obj/item/robot_module/scrubpup
 	name = "Scrub Pup"
 	basic_modules = list(
 		/obj/item/assembly/flash/cyborg,
@@ -232,8 +234,8 @@
 /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/borgi
+*/ //removes scrubpup module from the game
+/* /obj/item/robot_module/borgi
 	name = "Borgi"
 	basic_modules = list(
 		/obj/item/assembly/flash/cyborg,
@@ -260,7 +262,7 @@
 	hat_offset = INFINITY
 	cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
 	has_snowflake_deadsprite = TRUE
-
+*/ //removes Borgi from the game
 /*
 /obj/item/robot_module/orepup
 	name = "Ore Pup"
@@ -567,7 +569,7 @@
 			"BootyM" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootyengineerM"),
 			"BootyS" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootyengineerS")
 		)
-		var/list/L = list("Pupdozer" = "pupdozer", "Engihound" = "Engihound")
+		/*var/list/L = list("Pupdozer" = "pupdozer", "Engihound" = "Engihound")
 		for(var/a in L)
 			var/image/wide = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = L[a])
 			wide.pixel_x = -16
@@ -575,7 +577,7 @@
 		if(R.client?.ckey == "nezuli")
 			var/image/bad_snowflake = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "alina-sec")
 			bad_snowflake.pixel_x = -16
-			eng_models["Alina"] = bad_snowflake
+			eng_models["Alina"] = bad_snowflake*/ //removes pupdozer,engihound (this option doesn't work anyways)
 		eng_models = sortList(eng_models)
 	var/eng_borg_icon = show_radial_menu(R, R , eng_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE)
 	if(!eng_borg_icon)
@@ -609,22 +611,22 @@
 		if("Heavy")
 			cyborg_base_icon = "heavyeng"
 			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
-		if("Pup Dozer")
+		/*if("Pup Dozer")
 			cyborg_base_icon = "pupdozer"
 			can_be_pushed = FALSE
 			hat_offset = INFINITY
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 			has_snowflake_deadsprite = TRUE
 			dogborg = TRUE
-			cyborg_pixel_offset = -16
-		if("Engihound")
+			cyborg_pixel_offset = -16*/ //Removes pupdozer display
+		/*if("Engihound")
 			cyborg_base_icon = "valeeng"
 			can_be_pushed = FALSE
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 			has_snowflake_deadsprite = TRUE
 			sleeper_overlay = "valeengsleeper"
 			dogborg = TRUE
-			cyborg_pixel_offset = -16
+			cyborg_pixel_offset = -16 */ //Removes Engihound display
 		if("Alina")
 			cyborg_base_icon = "alina-eng"
 			special_light_key = "alina"