cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-17 19:22:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool

Browse Source
This commit is contained in:
Anewbe
2018-08-04 11:20:02 -05:00
parent b88b70eb61 6ffd299fd7
commit f1507ebfa2
36 changed files with 1316 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/shipping_error.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/datum/event/shipping_error/start()
var/datum/supply_order/O = new /datum/supply_order()
O.ordernum = supply_controller.ordernum
O.object = supply_controller.supply_packs[pick(supply_controller.supply_packs)]
O.orderedby = random_name(pick(MALE,FEMALE), species = SPECIES_HUMAN)
O.object = supply_controller.supply_pack[pick(supply_controller.supply_pack)]
O.ordered_by = random_name(pick(MALE,FEMALE), species = SPECIES_HUMAN)
supply_controller.shoppinglist += O
code/modules/gamemaster/actions/shipping_error.dm
+2 -2
View File
@@ -12,6 +12,6 @@
..()
var/datum/supply_order/O = new /datum/supply_order()
O.ordernum = supply_controller.ordernum
O.object = supply_controller.supply_packs[pick(supply_controller.supply_packs)]
O.orderedby = random_name(pick(MALE,FEMALE), species = "Human")
O.object = supply_controller.supply_pack[pick(supply_controller.supply_pack)]
O.ordered_by = random_name(pick(MALE,FEMALE), species = "Human")
supply_controller.shoppinglist += O
code/modules/reagents/dispenser/supply.dm
+10 -10
View File
@@ -1,4 +1,4 @@
/datum/supply_packs/chemistry_dispenser
/datum/supply_pack/chemistry_dispenser
name = "Reagent dispenser"
contains = list(
/obj/machinery/chemical_dispenser{anchored = 0}
@@ -8,7 +8,7 @@
containername = "reagent dispenser crate"
group = "Reagents"
/datum/supply_packs/beer_dispenser
/datum/supply_pack/beer_dispenser
name = "Booze dispenser"
contains = list(
/obj/machinery/chemical_dispenser/bar_alc{anchored = 0}
@@ -18,7 +18,7 @@
containername = "booze dispenser crate"
group = "Reagents"
/datum/supply_packs/soda_dispenser
/datum/supply_pack/soda_dispenser
name = "Soda dispenser"
contains = list(
/obj/machinery/chemical_dispenser/bar_soft{anchored = 0}
@@ -28,7 +28,7 @@
containername = "soda dispenser crate"
group = "Reagents"
/datum/supply_packs/reagents
/datum/supply_pack/reagents
name = "Chemistry dispenser refill"
contains = list(
/obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrogen,
@@ -60,7 +60,7 @@
access = list(access_chemistry)
group = "Reagents"
/datum/supply_packs/alcohol_reagents
/datum/supply_pack/alcohol_reagents
name = "Bar alcoholic dispenser refill"
contains = list(
/obj/item/weapon/reagent_containers/chem_disp_cartridge/beer,
@@ -83,7 +83,7 @@
access = list(access_bar)
group = "Reagents"
/datum/supply_packs/softdrink_reagents
/datum/supply_pack/softdrink_reagents
name = "Bar soft drink dispenser refill"
contains = list(
/obj/item/weapon/reagent_containers/chem_disp_cartridge/water,
@@ -110,7 +110,7 @@
containername = "soft drinks crate"
group = "Reagents"
/datum/supply_packs/coffee_reagents
/datum/supply_pack/coffee_reagents
name = "Coffee machine dispenser refill"
contains = list(
/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee,
@@ -127,7 +127,7 @@
containername = "coffee drinks crate"
group = "Reagents"
/datum/supply_packs/dispenser_cartridges
/datum/supply_pack/dispenser_cartridges
name = "Empty dispenser cartridges"
contains = list(
/obj/item/weapon/reagent_containers/chem_disp_cartridge,
@@ -147,7 +147,7 @@
group = "Reagents"
#define SEC_PACK(_tname, _type, _name, _cname, _cost, _access)\
datum/supply_packs/dispenser_cartridges{\
datum/supply_pack/dispenser_cartridges{\
_tname {\
name = _name ;\
containername = _cname ;\
@@ -159,7 +159,7 @@
}\
}
#define PACK(_tname, _type, _name, _cname, _cost)\
datum/supply_packs/dispenser_cartridges{\
datum/supply_pack/dispenser_cartridges{\
_tname {\
name = _name ;\
containername = _cname ;\
code/modules/research/designs/circuits.dm
+2 -2
View File
@@ -364,14 +364,14 @@ CIRCUITS BELOW
/datum/design/circuit/ordercomp
name = "supply ordering console"
id = "ordercomp"
build_path = /obj/item/weapon/circuitboard/ordercomp
build_path = /obj/item/weapon/circuitboard/supplycomp
sort_string = "KAAAY" // Duplicate string, really need to redo this whole thing
/datum/design/circuit/supplycomp
name = "supply control console"
id = "supplycomp"
req_tech = list(TECH_DATA = 3)
build_path = /obj/item/weapon/circuitboard/supplycomp
build_path = /obj/item/weapon/circuitboard/supplycomp/control
sort_string = "KAAAZ" // Duplicate string, really need to redo this whole thing
/datum/design/circuit/biogenerator