shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fuckatmos

Browse Source
This commit is contained in:
deathride58
2019-06-07 04:38:47 -04:00
committed by GitHub
parent 4fc31f6322 17febdd07c
commit aa53cc9ea9
201 changed files with 4784 additions and 1787 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/packs.dm
+2 -4
View File
@@ -873,8 +873,7 @@
/datum/supply_pack/engineering/shield_sat
name = "Shield Generator Satellite"
desc = "Protect the very existence of this station with these Anti-Meteor defenses. Contains three Shield Generator Satellites."
cost = 3000
special = TRUE
cost = 4000
contains = list(
/obj/machinery/satellite/meteor_shield,
/obj/machinery/satellite/meteor_shield,
@@ -886,8 +885,7 @@
/datum/supply_pack/engineering/shield_sat_control
name = "Shield System Control Board"
desc = "A control system for the Shield Generator Satellite system."
cost = 5000
special = TRUE
cost = 4000
contains = list(/obj/item/circuitboard/computer/sat_control)
crate_name= "shield control board crate"