Skip to content

Commit

Permalink
Marshal borgs (part 1 ?) (#5181)
Browse files Browse the repository at this point in the history
* Delete icons/mob/robot_tall/sec.dmi

* Add files via upload

* Delete icons/mob/robots.dmi

* Add files via upload

* Update robot_modules.dm

* Update robot_modules.dm
  • Loading branch information
Lamasmaster authored Apr 17, 2024
1 parent 00b2b53 commit af93de8
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions code/modules/mob/living/silicon/robot/robot_modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,9 @@ var/global/list/robot_modules = list(
"Contractor Tactical Alt" = "mmekasec",
"Contractor Foxtrot" = "mekasyndi_foxtrot",
"Contractor Traffic Light" = "fmekasyndi",
"Contractor Riot Stopper" = "mmekasyndi"
"Marshal Civil Servant" = "fmekasyndi_marshal", //Odio made this and for some reason named the original file slutty_bot.dmi so putting here so nobody will forget to shame him later for it.
"Contractor Riot Stopper" = "mmekasyndi",
"Marshal Riot Unit" = "mmekasyndi_marshal"
)

tall_sprites = list(
Expand All @@ -697,7 +699,9 @@ var/global/list/robot_modules = list(
"mmekasec",
"mekasyndi_foxtrot",
"fmekasyndi",
"mmekasyndi"
"fmekasyndi_marshal",
"mmekasyndi",
"mmekasyndi_marshal"
)

/obj/item/robot_module/security/defense/New(var/mob/living/silicon/robot/R)
Expand Down Expand Up @@ -770,7 +774,9 @@ var/global/list/robot_modules = list(
"Contractor Tactical Alt" = "mmekasec",
"Contractor Foxtrot" = "mekasyndi_foxtrot",
"Contractor Traffic Light" = "fmekasyndi",
"Contractor Riot Stopper" = "mmekasyndi"
"Marshal Civil Servant" = "fmekasyndi_marshal", //Odio made this and for some reason named the original file slutty_bot.dmi so putting here so nobody will forget to shame him later for it.
"Contractor Riot Stopper" = "mmekasyndi",
"Marshal Riot Unit" = "mmekasyndi_marshal"
)

tall_sprites = list(
Expand All @@ -781,7 +787,9 @@ var/global/list/robot_modules = list(
"mmekasec",
"mekasyndi_foxtrot",
"fmekasyndi",
"mmekasyndi"
"fmekasyndi_marshal",
"mmekasyndi",
"mmekasyndi_marshal"
)

/obj/item/robot_module/security/enforcement/New(var/mob/living/silicon/robot/R)
Expand Down
Binary file modified icons/mob/robot_tall/sec.dmi
Binary file not shown.
Binary file modified icons/mob/robots.dmi
Binary file not shown.

0 comments on commit af93de8

Please sign in to comment.