Bringing back the dogborgos.

-Also replaced the offset breaking forth-reset attack anim with forth-back as I did last time. -Dogborg pounce is currently broken and slapping people with hud icons may be harmful for immursions. -No Borgi yet because I can't be arsed to readd the whole sprite set this tired.
2017-04-23 02:36:31 +03:00
parent 8f6e9a729a
commit d66e609d48
8 changed files with 134 additions and 43 deletions
--- a/code/citadel/dogborgstuff.dm
+++ b/code/citadel/dogborgstuff.dm
@@ -1,13 +1,10 @@
-// Special tools and items for "Borgi" and "K-9 Unit"
-// PASTA SPAGHETTI FEST WOOHOOO!!! var/regrets = null
-
 /obj/item/weapon/dogborg/jaws/big
 	name = "combat jaws"
 	icon = 'icons/mob/dogborg.dmi'
 	icon_state = "jaws"
 	desc = "The jaws of the law."
 	flags = CONDUCT
-	force = 10
+	force = 12
 	throwforce = 0
 	hitsound = 'sound/weapons/bite.ogg'
 	attack_verb = list("chomped", "bit", "ripped", "mauled", "enforced")
@@ -20,7 +17,7 @@
 	icon_state = "smalljaws"
 	desc = "The jaws of a small dog."
 	flags = CONDUCT
-	force = 5
+	force = 6
 	throwforce = 0
 	hitsound = 'sound/weapons/bite.ogg'
 	attack_verb = list("nibbled", "bit", "gnawed", "chomped", "nommed")
@@ -38,7 +35,7 @@
 			icon_state = "jaws"
 			desc = "The jaws of the law."
 			flags = CONDUCT
-			force = 10
+			force = 12
 			throwforce = 0
 			hitsound = 'sound/weapons/bite.ogg'
 			attack_verb = list("chomped", "bit", "ripped", "mauled", "enforced")
@@ -62,20 +59,19 @@
 //Cuffs

 /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg/dog/attack(mob/living/carbon/C, mob/user)
-	if(isrobot(user))
-		if(!C.handcuffed)
-			playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
-			C.visible_message("<span class='danger'>[user] is trying to put zipties on [C]!</span>", \
-								"<span class='userdanger'>[user] is trying to put zipties on [C]!</span>")
-			if(do_mob(user, C, 30))
-				if(!C.handcuffed)
-					C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C)
-					C.update_inv_handcuffed(0)
-					user << "<span class='notice'>You handcuff [C].</span>"
-					playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
-					add_logs(user, C, "handcuffed")
-			else
-				user << "<span class='warning'>You fail to handcuff [C]!</span>"
+	if(!C.handcuffed)
+		playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
+		C.visible_message("<span class='danger'>[user] is trying to put zipties on [C]!</span>", \
+							"<span class='userdanger'>[user] is trying to put zipties on [C]!</span>")
+		if(do_mob(user, C, 30))
+			if(!C.handcuffed)
+				C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C)
+				C.update_inv_handcuffed(0)
+				user << "<span class='notice'>You handcuff [C].</span>"
+				playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
+				add_logs(user, C, "handcuffed")
+		else
+			user << "<span class='warning'>You fail to handcuff [C]!</span>"


 //Boop
@@ -95,7 +91,7 @@
 	user.visible_message("[user] sniffs around the air.", "<span class='warning'>You sniff the air for gas traces.</span>")

 	var/turf/location = user.loc
-	if (!( istype(location, /turf) ))
+	if(!istype(location))
 		return

 	var/datum/gas_mixture/environment = location.return_air()
@@ -103,15 +99,15 @@
 	var/pressure = environment.return_pressure()
 	var/total_moles = environment.total_moles()

-	user.show_message("<span class='info'><B>Results:</B></span>", 1)
+	to_chat(user, "<span class='info'><B>Results:</B></span>")
 	if(abs(pressure - ONE_ATMOSPHERE) < 10)
-		user.show_message("<span class='info'>Pressure: [round(pressure,0.1)] kPa</span>", 1)
+		to_chat(user, "<span class='info'>Pressure: [round(pressure,0.1)] kPa</span>")
 	else
-		user.show_message("<span class='alert'>Pressure: [round(pressure,0.1)] kPa</span>", 1)
+		to_chat(user, "<span class='alert'>Pressure: [round(pressure,0.1)] kPa</span>")
 	if(total_moles)
 		var/list/env_gases = environment.gases

-		environment.assert_gases(arglist(hardcoded_gases))
+		environment.assert_gases(arglist(GLOB.hardcoded_gases))
 		var/o2_concentration = env_gases["o2"][MOLES]/total_moles
 		var/n2_concentration = env_gases["n2"][MOLES]/total_moles
 		var/co2_concentration = env_gases["co2"][MOLES]/total_moles
@@ -119,27 +115,32 @@
 		environment.garbage_collect()

 		if(abs(n2_concentration - N2STANDARD) < 20)
-			user << "<span class='info'>Nitrogen: [round(n2_concentration*100, 0.01)] %</span>"
+			to_chat(user, "<span class='info'>Nitrogen: [round(n2_concentration*100, 0.01)] %</span>")
 		else
-			user << "<span class='alert'>Nitrogen: [round(n2_concentration*100, 0.01)] %</span>"
+			to_chat(user, "<span class='alert'>Nitrogen: [round(n2_concentration*100, 0.01)] %</span>")

 		if(abs(o2_concentration - O2STANDARD) < 2)
-			user << "<span class='info'>Oxygen: [round(o2_concentration*100, 0.01)] %</span>"
+			to_chat(user, "<span class='info'>Oxygen: [round(o2_concentration*100, 0.01)] %</span>")
 		else
-			user << "<span class='alert'>Oxygen: [round(o2_concentration*100, 0.01)] %</span>"
+			to_chat(user, "<span class='alert'>Oxygen: [round(o2_concentration*100, 0.01)] %</span>")

 		if(co2_concentration > 0.01)
-			user << "<span class='alert'>CO2: [round(co2_concentration*100, 0.01)] %</span>"
+			to_chat(user, "<span class='alert'>CO2: [round(co2_concentration*100, 0.01)] %</span>")
 		else
-			user << "<span class='info'>CO2: [round(co2_concentration*100, 0.01)] %</span>"
+			to_chat(user, "<span class='info'>CO2: [round(co2_concentration*100, 0.01)] %</span>")

 		if(plasma_concentration > 0.005)
-			user << "<span class='alert'>Plasma: [round(plasma_concentration*100, 0.01)] %</span>"
+			to_chat(user, "<span class='alert'>Plasma: [round(plasma_concentration*100, 0.01)] %</span>")
 		else
-			user << "<span class='info'>Plasma: [round(plasma_concentration*100, 0.01)] %</span>"
+			to_chat(user, "<span class='info'>Plasma: [round(plasma_concentration*100, 0.01)] %</span>")

-		user.show_message("<span class='info'>Temperature: [round(environment.temperature-T0C)] &deg;C</span>", 1)
-	return
+
+		for(var/id in env_gases)
+			if(id in GLOB.hardcoded_gases)
+				continue
+			var/gas_concentration = env_gases[id][MOLES]/total_moles
+			to_chat(user, "<span class='alert'>[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_concentration*100, 0.01)] %</span>")
+		to_chat(user, "<span class='info'>Temperature: [round(environment.temperature-T0C)] &deg;C</span>")


 //Delivery
@@ -262,7 +263,6 @@
 		if(do_after(user, src.cleanspeed, target = target))
 			user << "<span class='notice'>You clean \the [target.name].</span>"
 			target.color = initial(target.color)
-			target.set_opacity(initial(target.opacity))
 	else
 		user.visible_message("[user] begins to lick \the [target.name] clean...", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
 		if(do_after(user, src.cleanspeed, target = target))
@@ -382,13 +382,13 @@
 	else
 		dat += "<span class='linkOff'>Inject Epinephrine</span>"
 	if(patient && patient.health > min_health)
-		for(var/re in injection_chems)
-			var/datum/reagent/C = chemical_reagents_list[re]
+		for(var/chem in injection_chems)
+			var/datum/reagent/C = GLOB.chemical_reagents_list[chem]
 			if(C)
 				dat += "<BR><A href='?src=\ref[src];inject=[C.id]'>Inject [C.name]</A>"
 	else
-		for(var/re in injection_chems)
-			var/datum/reagent/C = chemical_reagents_list[re]
+		for(var/chem in injection_chems)
+			var/datum/reagent/C = GLOB.chemical_reagents_list[chem]
 			if(C)
 				dat += "<BR><span class='linkOff'>Inject [C.name]</span>"

@@ -473,7 +473,7 @@
 				var/mob/living/silicon/robot.R = user
 				R.cell.charge = R.cell.charge - 250 //-250 charge per sting.
 			var/units = round(patient.reagents.get_reagent_amount(chem))
-			user << "<span class='notice'>Occupant now has [units] unit\s of [chemical_reagents_list[chem]] in their bloodstream.</span>"
+			user << "<span class='notice'>Occupant now has [units] unit\s of [GLOB.chemical_reagents_list[chem]] in their bloodstream.</span>"

 /obj/item/weapon/dogborg/sleeper/process()
 	if(src.occupied == 0)
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -428,7 +428,8 @@
 		pixel_x_diff = -8

 	animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
-	animate(pixel_x = initial(pixel_x), pixel_y = final_pixel_y, time = 2)
+	//animate(pixel_x = initial(pixel_x), pixel_y = final_pixel_y, time = 2)
+	animate(pixel_x = pixel_x - pixel_x_diff, pixel_y = final_pixel_y, time = 2) //Putting back my non offset breaking method

 /atom/movable/proc/do_item_attack_animation(atom/A, visual_effect_icon, obj/item/used_item)
 	var/image/I
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -19,6 +19,18 @@
 	else if(istype(O, /obj/item/weapon/storage/bag/tray/))
 		var/obj/item/weapon/storage/bag/tray/T = O
 		T.do_quick_empty()
+	else if(istype(O,/obj/item/weapon/gun/energy/laser/cyborg))
+		laser = 0
+		update_icons()
+	else if(istype(O,/obj/item/weapon/gun/energy/disabler/cyborg))
+		disabler = 0
+		update_icons()
+	else if(istype(O,/obj/item/weapon/dogborg/sleeper))
+		sleeper_g = 0
+		sleeper_r = 0
+		update_icons()
+		var/obj/item/weapon/dogborg/sleeper/S = O
+		S.go_out()
 	if(client)
 		client.screen -= O
 	observer_screen_update(O,FALSE)
@@ -50,6 +62,12 @@
 	if(activated(O))
 		to_chat(src, "<span class='warning'>That module is already activated.</span>")
 		return
+	if(istype(O,/obj/item/weapon/gun/energy/laser/cyborg))
+		laser = 1
+		update_icons()
+	if(istype(O,/obj/item/weapon/gun/energy/disabler/cyborg))
+		disabler = 1
+		update_icons()
 	if(!held_items[1])
 		held_items[1] = O
 		O.screen_loc = inv1.screen_loc
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -200,7 +200,9 @@
 	"Medical" = /obj/item/weapon/robot_module/medical, \
 	"Miner" = /obj/item/weapon/robot_module/miner, \
 	"Janitor" = /obj/item/weapon/robot_module/janitor, \
-	"Service" = /obj/item/weapon/robot_module/butler)
+	"Service" = /obj/item/weapon/robot_module/butler, \
+	"MediHound" = /obj/item/weapon/robot_module/medihound, \
+	"Security K9" = /obj/item/weapon/robot_module/k9)
 	if(!config.forbid_peaceborg)
 		modulelist["Peacekeeper"] = /obj/item/weapon/robot_module/peacekeeper
 	if(!config.forbid_secborg)
@@ -584,6 +586,27 @@
 /mob/living/silicon/robot/update_icons()
 	cut_overlays()
 	icon_state = module.cyborg_base_icon
+
+	if(module.cyborg_base_icon == "medihound")
+		icon = 'icons/mob/widerobot.dmi'
+		pixel_x = -16
+		if(sleeper_g == 1)
+			add_overlay("sleeper_g")
+		if(sleeper_r == 1)
+			add_overlay("sleeper_r")
+		if(stat == DEAD)
+			icon_state = "medihound-wreck"
+
+	if(module.cyborg_base_icon == "k9")
+		icon = 'icons/mob/widerobot.dmi'
+		pixel_x = -16
+		if(laser == 1)
+			add_overlay("laser")
+		if(disabler == 1)
+			add_overlay("disabler")
+		if(stat == DEAD)
+			icon_state = "k9-wreck"
+
 	if(stat != DEAD && !(paralysis || stunned || weakened || low_power_mode)) //Not dead, not stunned.
 		if(!eye_lights)
 			eye_lights = new()
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -338,6 +338,54 @@
 	to_chat(loc, "<span class='userdanger'>While you have picked the security 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/weapon/robot_module/k9
+	name = "Security K-9 Unit module"
+	basic_modules = list(
+		/obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg/dog,
+		/obj/item/weapon/dogborg/jaws/big,
+		/obj/item/weapon/dogborg/pounce,
+		/obj/item/clothing/mask/gas/sechailer/cyborg,
+		/obj/item/weapon/soap/tongue,
+		/obj/item/device/analyzer/nose,
+		/obj/item/weapon/gun/energy/disabler/cyborg)
+	emag_modules = list(/obj/item/weapon/gun/energy/laser/cyborg)
+	ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security,
+		/obj/item/clockwork/ratvarian_spear/cyborg)
+	cyborg_base_icon = "k9"
+	moduleselect_icon = "k9"
+	feedback_key = "cyborg_k9"
+	can_be_pushed = FALSE
+	hat_offset = INFINITY
+
+/obj/item/weapon/robot_module/k9/do_transform_animation()
+	..()
+	loc << "<span class='userdanger'>While you have picked the security-k9 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/weapon/robot_module/medihound
+	name = "MediHound module"
+	basic_modules = list(
+		/obj/item/weapon/dogborg/jaws/small,
+		/obj/item/device/analyzer/nose,
+		/obj/item/weapon/soap/tongue,
+		/obj/item/device/healthanalyzer,
+		/obj/item/weapon/dogborg/sleeper,
+		/obj/item/weapon/twohanded/shockpaddles/hound,
+		/obj/item/device/sensor_device)
+	emag_modules = list(/obj/item/weapon/dogborg/pounce)
+	ratvar_modules = list(/obj/item/clockwork/slab/cyborg/medical,
+		/obj/item/clockwork/ratvarian_spear/cyborg)
+	cyborg_base_icon = "medihound"
+	moduleselect_icon = "medihound"
+	feedback_key = "cyborg_medihound"
+	can_be_pushed = FALSE
+	hat_offset = INFINITY
+
+/obj/item/weapon/robot_module/medihound/do_transform_animation()
+	..()
+	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/weapon/robot_module/security/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
 	..()
 	var/obj/item/weapon/gun/energy/e_gun/advtaser/cyborg/T = locate(/obj/item/weapon/gun/energy/e_gun/advtaser/cyborg) in basic_modules
--- a/icons/mob/screen_cyborg.dmi
+++ b/icons/mob/screen_cyborg.dmi
--- a/icons/mob/widerobot.dmi
+++ b/icons/mob/widerobot.dmi
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -162,6 +162,7 @@
 #include "code\citadel\cit_reagents.dm"
 #include "code\citadel\cit_uniforms.dm"
 #include "code\citadel\cit_vendors.dm"
+#include "code\citadel\dogborgstuff.dm"
 #include "code\citadel\organs\breasts.dm"
 #include "code\citadel\organs\eggsack.dm"
 #include "code\citadel\organs\genitals.dm"