cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4269 from LightningIron/master

Browse Source 
Bugfixes
This commit is contained in:
Ccomp5950
2014-01-10 19:28:23 -08:00
parent e0d4b59f2d b3bfc9684d
commit 3d34567d56
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/defines/obj/weapon.dm
View File

@@ -393,7 +393,9 @@
/obj/item/weapon/module/power_control /obj/item/weapon/module/power_control
name = "power control module" name = "power control module"
icon_state = "power_mod" icon_state = "power_mod"
desc = "Heavy-duty switching circuits for power control." desc = "Heavy-duty switching circuits for power control."
m_amt = 50
g_amt = 50
/obj/item/weapon/module/id_auth /obj/item/weapon/module/id_auth
name = "\improper ID authentication module" name = "\improper ID authentication module"

3
code/game/machinery/autolathe.dm
View File

@@ -16,7 +16,8 @@ var/global/list/autolathe_recipes = list( \
new /obj/item/weapon/stock_parts/console_screen(), \ new /obj/item/weapon/stock_parts/console_screen(), \
new /obj/item/weapon/airlock_electronics(), \ new /obj/item/weapon/airlock_electronics(), \
new /obj/item/weapon/airalarm_electronics(), \ new /obj/item/weapon/airalarm_electronics(), \
new /obj/item/weapon/firealarm_electronics(), \ new /obj/item/weapon/firealarm_electronics(), \
new /obj/item/weapon/module/power_control(), \
new /obj/item/stack/sheet/metal(), \ new /obj/item/stack/sheet/metal(), \
new /obj/item/stack/sheet/glass(), \ new /obj/item/stack/sheet/glass(), \
new /obj/item/stack/sheet/rglass(), \ new /obj/item/stack/sheet/rglass(), \

2
code/modules/research/designs.dm
View File

@@ -1451,7 +1451,7 @@ datum/design/chemsprayer
build_type = PROTOLATHE build_type = PROTOLATHE
materials = list("$metal" = 5000, "$glass" = 1000) materials = list("$metal" = 5000, "$glass" = 1000)
reliability_base = 100 reliability_base = 100
build_path = "/obj/item/weapon/chemsprayer" build_path = "/obj/item/weapon/reagent_containers/spray/chemsprayer"
datum/design/rapidsyringe datum/design/rapidsyringe
name = "Rapid Syringe Gun" name = "Rapid Syringe Gun"