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 branch 'master' into upstream-merge-10095

Browse Source
This commit is contained in:
Nadyr
2021-04-11 03:34:32 -04:00
committed by GitHub
parent bcf66850c1 683d9c5f30
commit a494347a7e
88 changed files with 20382 additions and 20572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/nifsoft/software/10_combat.dm
View File

@@ -7,7 +7,7 @@
illegal = TRUE
wear = 3
access = 999 //Prevents anyone from buying it without an emag.
activates = FALSE //It's armor.
//CHOMPSTATION edit. Makes NIF armour toggleable.
combat_flags = (NIF_C_BRUTEARMOR) // Default on when installed, clear when uninstalled
/datum/nifsoft/burn_armor
@@ -19,7 +19,7 @@
illegal = TRUE
wear = 3
access = 999 //Prevents anyone from buying it without an emag.
activates = FALSE //It's armor.
//CHOMPSTATION edit. Makes NIF armour toggleable.
combat_flags = (NIF_C_BURNARMOR) // Default on when installed, clear when uninstalled
/datum/nifsoft/painkillers