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

Merge pull request #6791 from Zuhayr/dev

Browse Source 
Removes references to the Syndicate and renames nuclear emergency mode.
This commit is contained in:
Chinsky
2014-10-21 01:13:17 +04:00
parent e082f4683a 99ff852e46
commit bad385e1d1
52 changed files with 127 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/energy/stun.dm
View File

@@ -61,7 +61,7 @@
/obj/item/weapon/gun/energy/crossbow
name = "mini energy-crossbow"
desc = "A weapon favored by many of the syndicates stealth specialists."
desc = "A weapon favored by many mercenary stealth specialists."
icon_state = "crossbow"
w_class = 2.0
item_state = "crossbow"
@@ -100,7 +100,7 @@
/obj/item/weapon/gun/energy/crossbow/largecrossbow
name = "Energy Crossbow"
desc = "A weapon favored by syndicate infiltration teams."
desc = "A weapon favored by mercenary infiltration teams."
w_class = 4.0
force = 10
matter = list("metal" = 200000)