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

Merge branch 'master' into weapon-removal

Browse Source
This commit is contained in:
Guti
2024-09-18 18:07:43 +02:00
parent 409aaba802 55ac1c54f0
commit f4f5476121
482 changed files with 5086 additions and 35138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/HolodeckObjects.dm
+2 -2
View File
@@ -506,11 +506,11 @@
/mob/living/simple_mob/animal/space/carp/holodeck/proc/set_safety(var/safe)
if (safe)
faction = "neutral"
faction = FACTION_NEUTRAL
melee_damage_lower = 0
melee_damage_upper = 0
else
faction = "carp"
faction = FACTION_CARP
melee_damage_lower = initial(melee_damage_lower)
melee_damage_upper = initial(melee_damage_upper)