cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 05:27:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
Guti
2024-09-18 18:12:57 +02:00
parent f4f5476121
commit 06a46a237b
39 changed files with 143 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/brain/robot.dm
+1 -1
View File
@@ -23,6 +23,6 @@
/obj/item/mmi/digital/robot/attack_self(mob/user as mob)
return //This object is technically a brain, and should not be dumping brains out of itself like its parent object does.
=======
/obj/item/device/mmi/digital/robot/attack_self(mob/user as mob)
/obj/item/mmi/digital/robot/attack_self(mob/user as mob)
return //This object is technically a brain, and should not be dumping brains out of itself like its parent object does.
>>>>>>> master
code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm
+5 -5
View File
@@ -32,11 +32,11 @@
var/to_wear_id_type = /obj/item/card/id
var/to_wear_id_job = "Assistant"
=======
var/to_wear_belt = /obj/item/weapon/storage/belt/utility/full
var/to_wear_l_pocket = /obj/item/weapon/soap
var/to_wear_r_pocket = /obj/item/device/pda
var/to_wear_back = /obj/item/weapon/storage/backpack
var/to_wear_id_type = /obj/item/weapon/card/id
var/to_wear_belt = /obj/item/storage/belt/utility/full
var/to_wear_l_pocket = /obj/item/soap
var/to_wear_r_pocket = /obj/item/pda
var/to_wear_back = /obj/item/storage/backpack
var/to_wear_id_type = /obj/item/card/id
var/to_wear_id_job = JOB_ALT_ASSISTANT
>>>>>>> master
code/modules/mob/living/silicon/robot/robot_modules/station.dm
+10 -10
View File
@@ -599,7 +599,7 @@ var/global/list/robot_modules = list(
/obj/item/robot_module/robot/clerical/butler
channels = list("Service" = 1)
=======
/obj/item/weapon/robot_module/robot/clerical/butler
/obj/item/robot_module/robot/clerical/butler
channels = list(CHANNEL_SERVICE = 1)
>>>>>>> master
@@ -687,15 +687,15 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/mining_scanner(src)
src.emag += new /obj/item/kinetic_crusher/machete/dagger(src)
=======
src.modules += new /obj/item/weapon/tool/wrench/cyborg(src)
src.modules += new /obj/item/weapon/tool/screwdriver/cyborg(src)
src.modules += new /obj/item/weapon/storage/bag/ore(src)
src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
src.modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
src.modules += new /obj/item/weapon/gripper/miner(src)
src.modules += new /obj/item/weapon/mining_scanner(src)
src.modules += new /obj/item/weapon/card/id/cargo/miner/borg(src)
src.emag += new /obj/item/weapon/kinetic_crusher/machete/dagger(src)
src.modules += new /obj/item/tool/wrench/cyborg(src)
src.modules += new /obj/item/tool/screwdriver/cyborg(src)
src.modules += new /obj/item/storage/bag/ore(src)
src.modules += new /obj/item/pickaxe/borgdrill(src)
src.modules += new /obj/item/storage/bag/sheetsnatcher/borg(src)
src.modules += new /obj/item/gripper/miner(src)
src.modules += new /obj/item/mining_scanner(src)
src.modules += new /obj/item/card/id/cargo/miner/borg(src)
src.emag += new /obj/item/kinetic_crusher/machete/dagger(src)
>>>>>>> master
src.modules += new /obj/item/dogborg/sleeper/compactor/supply(src)
code/modules/mob/transform_procs.dm
+2 -2
View File
@@ -181,9 +181,9 @@
O.job = JOB_CYBORG
if(O.mind.assigned_role == JOB_CYBORG)
if(O.mind.role_alt_title == JOB_ALT_ROBOT)
O.mmi = new /obj/item/device/mmi/digital/posibrain(O)
O.mmi = new /obj/item/mmi/digital/posibrain(O)
else if(O.mind.role_alt_title == JOB_ALT_DRONE)
O.mmi = new /obj/item/device/mmi/digital/robot(O)
O.mmi = new /obj/item/mmi/digital/robot(O)
>>>>>>> master
else
O.mmi = new /obj/item/mmi(O)