cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

Browse Source 
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
This commit is contained in:
Arokha Sieyes
2018-05-25 13:23:47 -04:00
parent b1b9090430 841837191c
commit 6b42df0685
291 changed files with 324089 additions and 16301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs.dm
+18 -1
View File
@@ -565,7 +565,6 @@ other types of metals and chemistry for reagents).
id = "decloner"
req_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 7, TECH_BIO = 5, TECH_POWER = 6)
materials = list("gold" = 5000,"uranium" = 10000)
chemicals = list("mutagen" = 40)
build_path = /obj/item/weapon/gun/energy/decloner
sort_string = "TAAAE"
@@ -752,6 +751,15 @@ other types of metals and chemistry for reagents).
build_path = /obj/item/device/lightreplacer
sort_string = "VAAAH"
datum/design/item/laserpointer
name = "laser pointer"
desc = "Don't shine it in your eyes!"
id = "laser_pointer"
req_tech = list(TECH_MAGNET = 3)
materials = list(DEFAULT_WALL_MATERIAL = 100, "glass" = 50)
build_path = /obj/item/device/laser_pointer
sort_string = "VAAAI"
/datum/design/item/paicard
name = "'pAI', personal artificial intelligence device"
id = "paicard"
@@ -842,6 +850,15 @@ other types of metals and chemistry for reagents).
build_path = /obj/item/weapon/storage/backpack/holding
sort_string = "VAEAA"
/datum/design/item/dufflebag_holding
name = "'DuffleBag of Holding', an infinite capacity dufflebag prototype"
desc = "A minaturized prototype of the popular Bag of Holding, the Dufflebag of Holding is, functionally, identical to the bag of holding, but comes in a more stylish and compact form."
id = "dufflebag_holding"
req_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 6)
materials = list("gold" = 3000, "diamond" = 1500, "uranium" = 250)
build_path = /obj/item/weapon/storage/backpack/holding/duffle
sort_string = "VAEAB"
/datum/design/item/binaryencrypt
name = "Binary encryption key"
desc = "Allows for deciphering the binary channel on-the-fly."