cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] allows robots to "holster" guns (#10061)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-04 01:31:52 -07:00
committed by GitHub
parent 68b493ab4d
commit 06a8bcaecb
2 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/mob/living/silicon/robot/inventory.dm
View File

@@ -154,6 +154,15 @@
return TRUE return TRUE
return FALSE return FALSE
// Checks if the activated module is of the given type
/mob/living/silicon/robot/proc/activated_module_type_list(var/list/type_to_compare, var/explicit = FALSE)
if(!islist(type_to_compare))
return FALSE
for(var/type in type_to_compare)
if(istype(module_active, type))
return TRUE
return FALSE
/mob/living/silicon/robot/proc/is_type_in_modules(var/type, var/list/modules, var/explicit = FALSE) /mob/living/silicon/robot/proc/is_type_in_modules(var/type, var/list/modules, var/explicit = FALSE)
for(var/atom/module in modules) for(var/atom/module in modules)
if(explicit && isatom(module)) if(explicit && isatom(module))
@@ -210,6 +219,7 @@
inv2.icon_state = "inv2" inv2.icon_state = "inv2"
inv3.icon_state = "inv3" inv3.icon_state = "inv3"
module_active = module_state_1 module_active = module_state_1
update_icon()
return return
if(2) if(2)
if(module_active != module_state_2) if(module_active != module_state_2)
@@ -217,6 +227,7 @@
inv2.icon_state = "inv2 +a" inv2.icon_state = "inv2 +a"
inv3.icon_state = "inv3" inv3.icon_state = "inv3"
module_active = module_state_2 module_active = module_state_2
update_icon()
return return
if(3) if(3)
if(module_active != module_state_3) if(module_active != module_state_3)
@@ -224,6 +235,7 @@
inv2.icon_state = "inv2" inv2.icon_state = "inv2"
inv3.icon_state = "inv3 +a" inv3.icon_state = "inv3 +a"
module_active = module_state_3 module_active = module_state_3
update_icon()
return return
return return
@@ -236,16 +248,19 @@
if(module_active == module_state_1) if(module_active == module_state_1)
inv1.icon_state = "inv1" inv1.icon_state = "inv1"
module_active = null module_active = null
update_icon()
return return
if(2) if(2)
if(module_active == module_state_2) if(module_active == module_state_2)
inv2.icon_state = "inv2" inv2.icon_state = "inv2"
module_active = null module_active = null
update_icon()
return return
if(3) if(3)
if(module_active == module_state_3) if(module_active == module_state_3)
inv3.icon_state = "inv3" inv3.icon_state = "inv3"
module_active = null module_active = null
update_icon()
return return
return return

60
code/modules/mob/living/silicon/robot/sprites/_sprite_datum.dm
View File

@@ -55,39 +55,37 @@
if(shield && shield.active) if(shield && shield.active)
ourborg.add_overlay("[sprite_icon_state]-shield") ourborg.add_overlay("[sprite_icon_state]-shield")
for(var/thing_to_check in ourborg.get_active_modules()) //We look at our active modules. Let's peep! if(ourborg.activated_module_type_list(list(/obj/item/melee/robotic, /obj/item/gun/energy/robotic)))
for(var/thing_to_check in ourborg.get_active_modules()) //We look at our active modules. Let's peep!
//Melee Check //Melee Check
if(istype(thing_to_check, /obj/item/melee/robotic)) if(istype(thing_to_check, /obj/item/melee/robotic))
var/obj/item/melee/robotic/melee = thing_to_check var/obj/item/melee/robotic/melee = thing_to_check
if(sprite_flag_check(ROBOT_HAS_MELEE_SPRITE) && melee.weapon_flag_check(COUNTS_AS_ROBOTIC_MELEE)) if(sprite_flag_check(ROBOT_HAS_MELEE_SPRITE) && melee.weapon_flag_check(COUNTS_AS_ROBOTIC_MELEE))
ourborg.add_overlay("[sprite_icon_state]-melee") ourborg.add_overlay("[sprite_icon_state]-melee")
continue continue
if(sprite_flag_check(ROBOT_HAS_DAGGER_SPRITE) && melee.weapon_flag_check(COUNTS_AS_ROBOT_DAGGER)) if(sprite_flag_check(ROBOT_HAS_DAGGER_SPRITE) && melee.weapon_flag_check(COUNTS_AS_ROBOT_DAGGER))
ourborg.add_overlay("[sprite_icon_state]-dagger") ourborg.add_overlay("[sprite_icon_state]-dagger")
continue continue
if(sprite_flag_check(ROBOT_HAS_BLADE_SPRITE) && melee.weapon_flag_check(COUNTS_AS_ROBOT_BLADE)) if(sprite_flag_check(ROBOT_HAS_BLADE_SPRITE) && melee.weapon_flag_check(COUNTS_AS_ROBOT_BLADE))
ourborg.add_overlay("[sprite_icon_state]-blade") ourborg.add_overlay("[sprite_icon_state]-blade")
continue continue
//Gun Check //Gun Check
if(istype(thing_to_check, /obj/item/gun/energy/robotic)) if(istype(thing_to_check, /obj/item/gun/energy/robotic))
var/obj/item/gun/energy/robotic/gun = thing_to_check var/obj/item/gun/energy/robotic/gun = thing_to_check
if(sprite_flag_check(ROBOT_HAS_GUN_SPRITE) && gun.gun_flag_check(COUNTS_AS_ROBOT_GUN)) if(sprite_flag_check(ROBOT_HAS_GUN_SPRITE) && gun.gun_flag_check(COUNTS_AS_ROBOT_GUN))
ourborg.add_overlay("[sprite_icon_state]-gun") ourborg.add_overlay("[sprite_icon_state]-gun")
continue continue
if(sprite_flag_check(ROBOT_HAS_LASER_SPRITE) && gun.gun_flag_check(COUNTS_AS_ROBOT_LASER)) if(sprite_flag_check(ROBOT_HAS_LASER_SPRITE) && gun.gun_flag_check(COUNTS_AS_ROBOT_LASER))
ourborg.add_overlay("[sprite_icon_state]-laser") ourborg.add_overlay("[sprite_icon_state]-laser")
continue continue
if(sprite_flag_check(ROBOT_HAS_TASER_SPRITE) && gun.gun_flag_check(COUNTS_AS_ROBOT_TASER)) if(sprite_flag_check(ROBOT_HAS_TASER_SPRITE) && gun.gun_flag_check(COUNTS_AS_ROBOT_TASER))
ourborg.add_overlay("[sprite_icon_state]-taser") ourborg.add_overlay("[sprite_icon_state]-taser")
continue continue
if(sprite_flag_check(ROBOT_HAS_DISABLER_SPRITE) && gun.gun_flag_check(COUNTS_AS_ROBOT_DISABLER)) if(sprite_flag_check(ROBOT_HAS_DISABLER_SPRITE) && gun.gun_flag_check(COUNTS_AS_ROBOT_DISABLER))
ourborg.add_overlay("[sprite_icon_state]-disabler") ourborg.add_overlay("[sprite_icon_state]-disabler")
continue continue
else //We are NEITHER a melee or a gun (Or whatever else you add in here in the future)
continue //Go on to the next.
return
/datum/robot_sprite/proc/get_belly_overlay(var/mob/living/silicon/robot/ourborg, var/size = 1, var/b_class) /datum/robot_sprite/proc/get_belly_overlay(var/mob/living/silicon/robot/ourborg, var/size = 1, var/b_class)
//Size //Size