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

Fix

Browse Source
This commit is contained in:
Guti
2024-09-18 18:33:15 +02:00
parent 06a46a237b
commit a3c7599065
19 changed files with 2 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/toy.dm
-6
View File
@@ -215,15 +215,9 @@
/*
* Cyborg
*/
<<<<<<< HEAD
/obj/item/gun/projectile/cyborgtoy
name = "\improper Donk-Soft Cyborg Blaster"
desc = "Donk-Soft Cyborg Blaster! It's Donk or Don't! Adult supervision required. Use to toggle between battle and cleanup mode."
=======
/obj/item/gun/projectile/cyborgtoy
name = "\improper Donk-Soft " + JOB_CYBORG + " Blaster"
desc = "Donk-Soft " + JOB_CYBORG + " Blaster! It's Donk or Don't! Adult supervision required. Use to toggle between battle and cleanup mode."
>>>>>>> master
icon = 'icons/obj/gun_toy.dmi'
icon_state = "smg"
caliber = "foam"