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

Merge pull request #14269 from Heroman3003/borg-event-stuff

Browse Source 
Adjusts events and refactors borgs a bit in process
This commit is contained in:
Heroman3003
2022-12-31 07:04:47 +10:00
committed by GitHub
parent 7bcdafa4f2 12918c673b
commit a533de71c6
13 changed files with 120 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/trash_vr.dm
+1 -1
View File
@@ -12,7 +12,7 @@
if(isrobot(M))
var/mob/living/silicon/robot/R = M
if(R.module.type == /obj/item/weapon/robot_module/robot/scrubpup) // You can now feed the trash borg yay.
if(R.module.type == /obj/item/weapon/robot_module/robot/janitor/scrubpup) // You can now feed the trash borg yay.
playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1)
user.drop_item()
forceMove(R.vore_selected)
code/game/objects/structures/door_assembly.dm
+1 -1
View File
@@ -161,7 +161,7 @@
update_state()
/obj/structure/door_assembly/attack_robot(mob/living/silicon/robot/user)
if(Adjacent(user) && (user.module && (istype(user.module,/obj/item/weapon/robot_module/robot/engineering/general)) \
if(Adjacent(user) && (user.module && (istype(user.module,/obj/item/weapon/robot_module/robot/engineering)) \
|| istype(user.module,/obj/item/weapon/robot_module/drone))) //Only dron (and engiborg) needs this.
rename_door(user)
code/game/objects/structures/windoor_assembly.dm
+1 -1
View File
@@ -76,7 +76,7 @@
update_state()
/obj/structure/windoor_assembly/attack_robot(mob/living/silicon/robot/user)
if(Adjacent(user) && (user.module && (istype(user.module,/obj/item/weapon/robot_module/robot/engineering/general)) \
if(Adjacent(user) && (user.module && (istype(user.module,/obj/item/weapon/robot_module/robot/engineering)) \
|| istype(user.module,/obj/item/weapon/robot_module/drone))) //Only dron (and engiborg) needs this.
rename_door(user)