cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-01-04 20:29:46 -05:00
committed by GitHub
parent 5404cffe00
commit ef9168d717
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+2 -14
View File
@@ -63,19 +63,6 @@
)
/hook/startup/proc/robot_modules_vr()
<<<<<<< HEAD
robot_modules["Medihound"] = /obj/item/weapon/robot_module/robot/medihound
robot_modules["K9"] = /obj/item/weapon/robot_module/robot/knine
robot_modules["ERT"] = /obj/item/weapon/robot_module/robot/ert
robot_modules["Janihound"] = /obj/item/weapon/robot_module/robot/scrubpup
robot_modules["Sci-borg"] = /obj/item/weapon/robot_module/robot/science
robot_modules["Pupdozer"] = /obj/item/weapon/robot_module/robot/engiedog
robot_modules["Service-Hound"] = /obj/item/weapon/robot_module/robot/clerical/brodog
robot_modules["BoozeHound"] = /obj/item/weapon/robot_module/robot/booze
robot_modules["KMine"] = /obj/item/weapon/robot_module/robot/kmine
robot_modules["UnityHound"] = /obj/item/weapon/robot_module/robot/chound //CHOMP Addition Unity
robot_modules["Honk-Hound"] = /obj/item/weapon/robot_module/robot/clerical/honkborg //CHOMP Addition Honk
=======
robot_modules["Medihound"] = /obj/item/weapon/robot_module/robot/medical/medihound
robot_modules["K9"] = /obj/item/weapon/robot_module/robot/security/knine
robot_modules["ERT"] = /obj/item/weapon/robot_module/robot/security/ert
@@ -85,7 +72,8 @@
robot_modules["Service-Hound"] = /obj/item/weapon/robot_module/robot/clerical/butler/brodog
robot_modules["BoozeHound"] = /obj/item/weapon/robot_module/robot/clerical/butler/booze
robot_modules["KMine"] = /obj/item/weapon/robot_module/robot/miner/kmine
>>>>>>> a533de71c6... Merge pull request #14269 from Heroman3003/borg-event-stuff
robot_modules["UnityHound"] = /obj/item/weapon/robot_module/robot/chound //CHOMP Addition Unity
robot_modules["Honk-Hound"] = /obj/item/weapon/robot_module/robot/clerical/honkborg //CHOMP Addition Honk
robot_modules["Stray"] = /obj/item/weapon/robot_module/robot/stray
robot_modules["TraumaHound"] = /obj/item/weapon/robot_module/robot/medical/traumahound
return 1