mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-30 23:46:43 +01:00
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts: # code/ATMOSPHERICS/pipes.dm # code/game/turfs/flooring/flooring.dm # code/modules/clothing/clothing_accessories.dm # code/modules/mob/living/carbon/human/inventory.dm # html/changelogs/.all_changelog.yml
This commit is contained in:
@@ -116,14 +116,6 @@
|
||||
containername = "Robolimb blueprints (Bishop)"
|
||||
access = access_robotics
|
||||
|
||||
/datum/supply_packs/robotics/robolimbs/veymed
|
||||
name = "Vey-Med robolimb blueprints"
|
||||
contains = list(/obj/item/weapon/disk/limb/veymed)
|
||||
cost = 70
|
||||
containertype = /obj/structure/closet/crate/secure/science
|
||||
containername = "Robolimb blueprints (Vey-Med)"
|
||||
access = access_robotics
|
||||
|
||||
/datum/supply_packs/robotics/mecha_ripley
|
||||
name = "Circuit Crate (\"Ripley\" APLU)"
|
||||
contains = list(
|
||||
|
||||
Reference in New Issue
Block a user