mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
[New Map] Fixes Dumb Turrets (#2621)
Removes most instances of doublepane glass walls in one tile corridors, which the game was not designed for, thus interfering with turret target calculations and throwing objects. This means that the turrets in telecoms and in the vault will be more responsive to intruders. Re-adds the fourth miner slot, but this time properly maps in a locker, spawn pos, hardsuit, and his own new type of flag - the purple flag (not that anyone uses flags ayy lmao.) To further cement the uselessness of flags, all miners and the QM now start with a GPS. CT's should now have access to the end of the miner belt, allowing them to collect resources. Ore boxes can now be purchased and crafted from wood.
This commit is contained in:
@@ -116,6 +116,7 @@
|
||||
recipes += new/datum/stack_recipe("beehive assembly", /obj/item/beehive_assembly, 4)
|
||||
recipes += new/datum/stack_recipe("beehive frame", /obj/item/honey_frame, 1)
|
||||
recipes += new/datum/stack_recipe("book shelf", /obj/structure/bookcase, 5, time = 15, one_per_turf = 1, on_floor = 1)
|
||||
recipes += new/datum/stack_recipe("ore box", /obj/structure/ore_box, 10, time = 15, one_per_turf = 1, on_floor = 1)
|
||||
|
||||
/material/cardboard/generate_recipes()
|
||||
..()
|
||||
@@ -140,11 +141,11 @@
|
||||
..()
|
||||
recipes += new/datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos)
|
||||
recipes += new/datum/stack_recipe("alien suit", /obj/item/clothing/suit/xenos, 3)
|
||||
|
||||
|
||||
/material/hide/corgi/generate_recipes()
|
||||
..()
|
||||
recipes += new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/storage/hooded/wintercoat/corgi, 3)
|
||||
|
||||
|
||||
/material/hide/monkey/generate_recipes()
|
||||
..()
|
||||
recipes += new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask)
|
||||
|
||||
@@ -11,6 +11,7 @@ var/global/list/minevendor_list = list( //keep in order of price
|
||||
new /datum/data/mining_equipment("5 Red Flags", /obj/item/stack/flag/red, 50),
|
||||
new /datum/data/mining_equipment("5 Green Flags", /obj/item/stack/flag/green, 50),
|
||||
new /datum/data/mining_equipment("5 Yellow Flags", /obj/item/stack/flag/yellow, 50),
|
||||
new /datum/data/mining_equipment("5 Purple Flags", /obj/item/stack/flag/purple, 50),
|
||||
new /datum/data/mining_equipment("Ore-bag", /obj/item/weapon/storage/bag/ore, 50),
|
||||
new /datum/data/mining_equipment("Meat Pizza", /obj/item/pizzabox/meat, 50),
|
||||
new /datum/data/mining_equipment("Lantern", /obj/item/device/flashlight/lantern, 75),
|
||||
@@ -19,6 +20,7 @@ var/global/list/minevendor_list = list( //keep in order of price
|
||||
new /datum/data/mining_equipment("Pickaxe", /obj/item/weapon/pickaxe, 100),
|
||||
new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100),
|
||||
new /datum/data/mining_equipment("Compressed rail cartridge", /obj/item/weapon/rrf_ammo, 100),
|
||||
new /datum/data/mining_equipment("Ore Box", /obj/structure/ore_box, 150, 1),
|
||||
new /datum/data/mining_equipment("Emergency Floodlight", /obj/item/weapon/floodlight_diy, 150),
|
||||
new /datum/data/mining_equipment("Premium Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150),
|
||||
new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150),
|
||||
|
||||
@@ -364,6 +364,11 @@
|
||||
singular_name = "green flag"
|
||||
icon_state = "greenflag"
|
||||
|
||||
/obj/item/stack/flag/purple
|
||||
name = "purple flags"
|
||||
singular_name = "purple flag"
|
||||
icon_state = "purpflag"
|
||||
|
||||
/obj/item/stack/flag/attackby(obj/item/W as obj, mob/user as mob)
|
||||
if(upright && istype(W,src.type))
|
||||
src.attack_hand(user)
|
||||
|
||||
Reference in New Issue
Block a user