Merge pull request #312 from foopwo/raretwoleggedborg

Cyborg fluffsprite plus change to fluff icon requisites.

code/controllers/subsystems/robot_sprites.dm

@@ -65,7 +65,7 @@ SUBSYSTEM_DEF(robot_sprites)
 		return
 
 	if(wlcheck && istype(wlcheck))
-		. |= get_whitelisted_sprites(wlcheck.ckey, wlcheck.sprite_name, module)
+		. |= get_whitelisted_sprites(wlcheck.ckey, module)
 
 	. |= cyborg_sprites_by_module[module]
 
@@ -78,7 +78,7 @@ SUBSYSTEM_DEF(robot_sprites)
 	var/list/sprite_list = cyborg_sprites_by_module[module]
 
 	if(wlcheck && istype(wlcheck))
-		sprite_list |= get_whitelisted_sprites(wlcheck.ckey, wlcheck.sprite_name, module)
+		sprite_list |= get_whitelisted_sprites(wlcheck.ckey, module)
 
 	if(!islist(sprite_list))
 		return 0
@@ -102,14 +102,14 @@ SUBSYSTEM_DEF(robot_sprites)
 
 	return chosen_sprite
 
-/datum/controller/subsystem/robot_sprites/proc/get_whitelisted_sprites(var/ckey, var/spritename, var/module)
+/datum/controller/subsystem/robot_sprites/proc/get_whitelisted_sprites(var/ckey, var/module)
 	. = list()
 
-	if(!ckey || !spritename || !module || !(module in whitelisted_sprites_by_module))
+	if(!ckey || !module || !(module in whitelisted_sprites_by_module))
 		return
 
 	for(var/datum/robot_sprite/RS in whitelisted_sprites_by_module[module])
-		if(RS.whitelist_ckey == ckey && RS.whitelist_charname == spritename)
+		if(RS.whitelist_ckey == ckey)
 			. |= RS
 
 	return

code/modules/mob/living/silicon/robot/sprites/_sprite_datum.dm

@@ -25,7 +25,6 @@
 
 	var/is_whitelisted = FALSE
 	var/whitelist_ckey
-	var/whitelist_charname
 
 /datum/robot_sprite/proc/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
 	return

code/modules/mob/living/silicon/robot/sprites/fluff.dm

@@ -21,7 +21,6 @@
 
 	is_whitelisted = TRUE
 	whitelist_ckey = "argonne"
-	whitelist_charname = "RUSS"
 
 /datum/robot_sprite/dogborg/crisis/fluff/argonne
 	name = CUSTOM_BORGSPRITE("RUSS")
@@ -40,7 +39,6 @@
 
 	is_whitelisted = TRUE
 	whitelist_ckey = "argonne"
-	whitelist_charname = "RUSS"
 
 /datum/robot_sprite/dogborg/surgical/fluff/argonne
 	name = CUSTOM_BORGSPRITE("RUSS")
@@ -59,7 +57,6 @@
 
 	is_whitelisted = TRUE
 	whitelist_ckey = "argonne"
-	whitelist_charname = "RUSS"
 
 /datum/robot_sprite/dogborg/engineering/fluff/argonne
 	name = CUSTOM_BORGSPRITE("RUSS")
@@ -78,7 +75,6 @@
 
 	is_whitelisted = TRUE
 	whitelist_ckey = "argonne"
-	whitelist_charname = "RUSS"
 
 /datum/robot_sprite/dogborg/science/fluff/argonne
 	name = CUSTOM_BORGSPRITE("RUSS")
@@ -97,7 +93,6 @@
 
 	is_whitelisted = TRUE
 	whitelist_ckey = "argonne"
-	whitelist_charname = "RUSS"
 
 /datum/robot_sprite/dogborg/mining/fluff/argonne
 	name = CUSTOM_BORGSPRITE("RUSS")
@@ -116,7 +111,6 @@
 
 	is_whitelisted = TRUE
 	whitelist_ckey = "argonne"
-	whitelist_charname = "RUSS"
 
 /datum/robot_sprite/dogborg/service/fluff/argonne
 	name = CUSTOM_BORGSPRITE("RUSS")
@@ -135,7 +129,56 @@
 
 	is_whitelisted = TRUE
 	whitelist_ckey = "argonne"
-	whitelist_charname = "RUSS"
+
+// F
+
+/datum/robot_sprite/security/fluff/foopwotch
+	name = CUSTOM_BORGSPRITE("NDF") //For: GAEL
+
+	sprite_icon = 'icons/mob/robot/fluff.dmi'
+	sprite_icon_state = "foopwotch-ndfsec"
+
+	has_eye_light_sprites = TRUE
+	has_vore_belly_sprites = TRUE
+	has_custom_open_sprites = TRUE
+	has_dead_sprite = TRUE
+	has_dead_sprite_overlay = FALSE
+
+	is_whitelisted = TRUE
+	whitelist_ckey = "foopwotch"
+
+/datum/robot_sprite/security/fluff/foopwotch/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
+	if(istype(ourborg.module_active, /obj/item/weapon/gun/energy/laser/mounted))
+		ourborg.add_overlay("[sprite_icon_state]-laser")
+	if(istype(ourborg.module_active, /obj/item/weapon/gun/energy/taser/mounted/cyborg))
+		ourborg.add_overlay("[sprite_icon_state]-taser")
+
+/datum/robot_sprite/combat/fluff/foopwotch
+	name = CUSTOM_BORGSPRITE("NDF") //For: GAEL
+
+	sprite_icon = 'icons/mob/robot/fluff.dmi'
+	sprite_icon_state = "foopwotch-ndfcmb"
+
+	has_eye_light_sprites = TRUE
+	has_vore_belly_sprites = TRUE
+	has_custom_open_sprites = TRUE
+	has_dead_sprite = TRUE
+	has_dead_sprite_overlay = FALSE
+	has_speed_sprite = TRUE
+	has_shield_sprite = TRUE
+
+	is_whitelisted = TRUE
+	whitelist_ckey = "foopwotch"
+
+/datum/robot_sprite/combat/fluff/foopwotch/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
+
+	..()
+	if(istype(ourborg.module_active, /obj/item/weapon/gun/energy/laser/mounted) || istype(ourborg.module_active, /obj/item/weapon/gun/energy/lasercannon/mounted))
+		ourborg.add_overlay("[sprite_icon_state]-laser")
+	if(istype(ourborg.module_active, /obj/item/weapon/combat_borgblade))
+		ourborg.add_overlay("[sprite_icon_state]-dagger")
+	if(istype(ourborg.module_active, /obj/item/weapon/gun/energy/taser/mounted/cyborg/ertgun))
+		ourborg.add_overlay("[sprite_icon_state]-disabler")
 
 // J
 
@@ -156,7 +199,6 @@
 
 	is_whitelisted = TRUE
 	whitelist_ckey = "jademanique"
-	whitelist_charname = "B.A.U-Kingside"
 
 /datum/robot_sprite/dogborg/security/fluff/jademanique/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
 	if(istype(ourborg.module_active, /obj/item/weapon/gun/energy/laser/mounted))
@@ -182,4 +224,3 @@
 
 	is_whitelisted = TRUE
 	whitelist_ckey = "lunarfleet"
-	whitelist_charname = "Clea-Nor"