cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update robot.dm

Browse Source
This commit is contained in:
Novacat
2020-08-30 14:59:10 -04:00
committed by GitHub
parent 8174488f34
commit ac15f36943
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -705,15 +705,7 @@
if(istype(user,/mob/living/carbon/human) && !opened) if(istype(user,/mob/living/carbon/human) && !opened)
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
<<<<<<< HEAD
//VOREStation Removal
//if(H.species.can_shred(H))
// attack_generic(H, rand(30,50), "slashed")
// return
//Adding borg petting. Help intent pets, Disarm intent taps, Grab should remove the battery for replacement, and Harm is punching(no damage)
=======
//Adding borg petting. Help intent pets, Disarm intent taps and Harm is punching(no damage) //Adding borg petting. Help intent pets, Disarm intent taps and Harm is punching(no damage)
>>>>>>> 4cd8585... Makes borg cell replacement take priority over petting (#7579)
switch(H.a_intent) switch(H.a_intent)
if(I_HELP) if(I_HELP)
visible_message("<span class='notice'>[H] pets [src].</span>") visible_message("<span class='notice'>[H] pets [src].</span>")