diff --git a/code/game/machinery/casino_prize_dispenser_ch.dm b/code/game/machinery/casino_prize_dispenser_ch.dm index 456c3e2e9a..d6328cb99c 100644 --- a/code/game/machinery/casino_prize_dispenser_ch.dm +++ b/code/game/machinery/casino_prize_dispenser_ch.dm @@ -218,7 +218,7 @@ CASINO_PRIZE("Genemod: Regenerate", /obj/item/weapon/dnainjector/regenerate, 1, 1000, "implants"), CASINO_PRIZE("Genemod: Remote view", /obj/item/weapon/dnainjector/remoteview, 1, 1000, "implants"), CASINO_PRIZE("Genemod: Sprinter", /obj/item/weapon/dnainjector/runfast, 1, 1000, "implants"), - CASINO_PRIZE("Genemod: Telepathy", /obj/item/weapon/dnainjector/telemut, 1, 1000, "implants"), + CASINO_PRIZE("Genemod: Telekinesis", /obj/item/weapon/dnainjector/telemut, 1, 1000, "implants"), CASINO_PRIZE("Genemod: X-ray", /obj/item/weapon/dnainjector/xraymut, 1, 1000, "implants"), ) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 46d2284f9f..1a3c1e8532 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -376,8 +376,12 @@ t = replacetext(t, "\[/row\]", "") //CHOMPEDIT: nuking closing statements for rows. t = replacetext(t, "\[cell\]", "
") //CHOMPEdit
- t = replacetext(t, "\[sglogo\]", "
") //CHOMPEdit
+ //CHOMPEdit Start
+ t = replacetext(t, "\[logo\]", "
")
+ t = replacetext(t, "\[sglogo\]", "
")
+ t = replacetext(t, "\[trlogo\]", "
")
+ t = replacetext(t, "\[pclogo\]", "
")
+ //CHOMPEdit End
t = "[t]"
else // If it is a crayon, and he still tries to use these, make them empty!
diff --git a/html/images/pclogo.png b/html/images/pclogo.png
new file mode 100644
index 0000000000..b121b5f8a0
Binary files /dev/null and b/html/images/pclogo.png differ
diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/combat.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/combat.dm
index 2c061907f3..9b9f945cc4 100644
--- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/combat.dm
+++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/combat.dm
@@ -22,3 +22,48 @@
name = "K4T"
sprite_icon_state = "k4tsyndi"
has_vore_belly_sprites = FALSE
+
+//Using our own category wide here not to interfere with upstream in case they add wide sprites under just dogborg.
+/datum/robot_sprite/dogborg/wide/combat
+ module_type = "Combat"
+ has_custom_equipment_sprites = TRUE
+ var/has_gun_sprite = FALSE
+ var/has_taser_sprite = FALSE
+ var/has_blade_sprite = FALSE
+
+/datum/robot_sprite/dogborg/wide/combat/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
+ if(has_gun_sprite && (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 (has_taser_sprite && (istype(ourborg.module_active, /obj/item/weapon/gun/energy/taser/mounted/cyborg/ertgun)))
+ ourborg.add_overlay("[sprite_icon_state]-taser")
+ if (has_blade_sprite && (istype(ourborg.module_active, /obj/item/weapon/combat_borgblade)))
+ ourborg.add_overlay("[sprite_icon_state]-blade")
+
+/datum/robot_sprite/dogborg/wide/combat/blade/do_equipment_glamour(var/obj/item/weapon/robot_module/module)
+ if(!has_custom_equipment_sprites)
+ return
+
+ ..()
+
+ var/obj/item/weapon/combat_borgblade/CBB = locate() in module.modules
+ if(CBB)
+ CBB.name = "combat saw"
+ CBB.desc = "A high frequency blade attached to the end of a cyborg's tail. It appears to be extremely sharp."
+ var/obj/item/weapon/borg_combat_shocker/BCS = locate() in module.modules
+ if(BCS)
+ BCS.name = "combat jaws"
+ BCS.desc = "Shockingly chompy!"
+ BCS.icon_state = "ertjaws"
+ BCS.hitsound = 'sound/weapons/bite.ogg'
+ BCS.attack_verb = list("chomped", "bit", "ripped", "mauled", "enforced")
+ BCS.dogborg = TRUE
+
+/datum/robot_sprite/dogborg/wide/combat/blade
+ sprite_icon = 'modular_chomp/icons/mob/widerobot_ch.dmi'
+ name = "Blade"
+ sprite_icon_state = "blade"
+ sprite_hud_icon_state = "ert"
+ rest_sprite_options = list()
+ has_gun_sprite = TRUE
+ has_taser_sprite = TRUE
+ has_blade_sprite = TRUE
diff --git a/modular_chomp/icons/mob/widerobot_ch.dmi b/modular_chomp/icons/mob/widerobot_ch.dmi
index 7d20721a80..34608152b4 100644
Binary files a/modular_chomp/icons/mob/widerobot_ch.dmi and b/modular_chomp/icons/mob/widerobot_ch.dmi differ