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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

Browse Source
This commit is contained in:
Putnam3145
2022-05-17 13:22:40 -07:00
parent d5c36b4a99 35f86287e2
commit 33889870c9
1311 changed files with 12771 additions and 10321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/blackmarket/blackmarket_telepad.dm
+1 -1
View File
@@ -25,7 +25,7 @@
var/transmitting // Current /datum/blackmarket_purchase being sent to the target uplink.
var/list/datum/blackmarket_purchase/queue = list() // Queue for purchases that the machine should recieve and send.
/obj/machinery/ltsrbt/Initialize()
/obj/machinery/ltsrbt/Initialize(mapload)
. = ..()
SSblackmarket.telepads += src
code/modules/cargo/blackmarket/blackmarket_uplink.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/item/blackmarket_uplink
name = "Black Market Uplink"
desc = "A mishmash of a subspace amplifier, a radio, and an analyzer. Somehow able to access the black market, with a variable inventory in limited stock at inflated prices. No refunds, customer responsible for pick-ups."
desc = "A mishmash of a subspace amplifier, a radio, and an analyzer. Somehow able to access the black market, with a variable inventory in limited stock at inflated prices. No refunds, customer responsible for pick-ups."
icon = 'icons/obj/blackmarket.dmi'
icon_state = "uplink"
// UI variables.
@@ -13,7 +13,7 @@
var/money = 0 // How much money is inserted into the uplink.
var/list/accessible_markets = list(/datum/blackmarket_market/blackmarket) // List of typepaths for "/datum/blackmarket_market"s that this uplink can access.
/obj/item/blackmarket_uplink/Initialize()
/obj/item/blackmarket_uplink/Initialize(mapload)
. = ..()
if(accessible_markets.len)
viewing_market = accessible_markets[1]
code/modules/cargo/bounties/mech.dm
+9 -9
View File
@@ -5,8 +5,8 @@
/datum/bounty/item/mech/ship(obj/O)
if(!applies_to(O))
return
if(istype(O, /obj/mecha))
var/obj/mecha/M = O
if(istype(O, /obj/vehicle/sealed/mecha))
var/obj/vehicle/sealed/mecha/M = O
M.wreckage = null // So the mech doesn't explode.
..()
@@ -16,30 +16,30 @@
/datum/bounty/item/mech/ripley
name = "APLU \"Ripley\""
reward = 13000
wanted_types = list(/obj/mecha/working/ripley)
exclude_types = list(/obj/mecha/working/ripley/firefighter)
wanted_types = list(/obj/vehicle/sealed/mecha/working/ripley)
exclude_types = list(/obj/vehicle/sealed/mecha/working/ripley/firefighter)
/datum/bounty/item/mech/firefighter
name = "APLU \"Firefighter\""
reward = 18000
wanted_types = list(/obj/mecha/working/ripley/firefighter)
wanted_types = list(/obj/vehicle/sealed/mecha/working/ripley/firefighter)
/datum/bounty/item/mech/odysseus
name = "Odysseus"
reward = 11000
wanted_types = list(/obj/mecha/medical/odysseus)
wanted_types = list(/obj/vehicle/sealed/mecha/medical/odysseus)
/datum/bounty/item/mech/gygax
name = "Gygax"
reward = 28000
wanted_types = list(/obj/mecha/combat/gygax)
wanted_types = list(/obj/vehicle/sealed/mecha/combat/gygax)
/datum/bounty/item/mech/durand
name = "Durand"
reward = 20000
wanted_types = list(/obj/mecha/combat/durand)
wanted_types = list(/obj/vehicle/sealed/mecha/combat/durand)
/datum/bounty/item/mech/phazon
name = "Phazon"
reward = 50000
wanted_types = list(/obj/mecha/combat/phazon)
wanted_types = list(/obj/vehicle/sealed/mecha/combat/phazon)
code/modules/cargo/bounties/reagent.dm
+1
View File
@@ -139,6 +139,7 @@
/datum/reagent/medicine/atropine,\
/datum/reagent/medicine/strange_reagent,\
/datum/reagent/medicine/regen_jelly,\
/datum/reagent/medicine/limb_regrowth,\
/datum/reagent/drug/space_drugs,\
/datum/reagent/drug/crank,\
/datum/reagent/drug/krokodil,\
code/modules/cargo/bounty_console.dm
+2 -2
View File
@@ -9,7 +9,7 @@
var/printer_ready = 0 //cooldown var
var/static/datum/bank_account/cargocash
/obj/machinery/computer/bounty/Initialize()
/obj/machinery/computer/bounty/Initialize(mapload)
. = ..()
printer_ready = world.time + PRINTER_TIMEOUT
cargocash = SSeconomy.get_dep_account(ACCOUNT_CAR)
@@ -20,7 +20,7 @@
/obj/item/paper/bounty_printout
name = "paper - Bounties"
/obj/item/paper/bounty_printout/Initialize()
/obj/item/paper/bounty_printout/Initialize(mapload)
. = ..()
info = "<h2>Nanotrasen Cargo Bounties</h2></br>"
update_icon()
code/modules/cargo/console.dm
+1 -1
View File
@@ -34,7 +34,7 @@
can_approve_requests = FALSE
requestonly = TRUE
/obj/machinery/computer/cargo/Initialize()
/obj/machinery/computer/cargo/Initialize(mapload)
. = ..()
radio = new /obj/item/radio/headset/headset_cargo(src)
code/modules/cargo/exports.dm
+1 -1
View File
@@ -61,7 +61,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
if(ismob(thing))
thing.investigate_log("deleted through cargo export",INVESTIGATE_CARGO)
if(ismecha(thing))
var/obj/mecha/mech = thing
var/obj/vehicle/sealed/mecha/mech = thing
mech.wreckage = null // why a mech left a wreck when sold i will never know
qdel(thing)
code/modules/cargo/exports/large_objects.dm
+14 -14
View File
@@ -278,69 +278,69 @@
/datum/export/large/mech/odysseus
cost = 7500
unit_name = "working odysseus"
export_types = list(/obj/mecha/medical/odysseus)
export_types = list(/obj/vehicle/sealed/mecha/medical/odysseus)
/datum/export/large/mech/ripley
cost = 12000
unit_name = "working ripley"
export_types = list(/obj/mecha/working/ripley)
export_types = list(/obj/vehicle/sealed/mecha/working/ripley)
/datum/export/large/mech/firefighter
cost = 14000
unit_name = "working firefighter"
export_types = list(/obj/mecha/working/ripley/firefighter)
export_types = list(/obj/vehicle/sealed/mecha/working/ripley/firefighter)
/datum/export/large/mech/gygax
cost = 19000
unit_name = "working gygax"
export_types = list(/obj/mecha/combat/gygax)
export_types = list(/obj/vehicle/sealed/mecha/combat/gygax)
/datum/export/large/mech/durand
cost = 16000
unit_name = "working durand"
export_types = list(/obj/mecha/combat/durand)
export_types = list(/obj/vehicle/sealed/mecha/combat/durand)
/datum/export/large/mech/phazon
cost = 35000 //Little over half due to needing a core
unit_name = "working phazon"
export_types = list(/obj/mecha/combat/phazon)
export_types = list(/obj/vehicle/sealed/mecha/combat/phazon)
/datum/export/large/mech/marauder
cost = 15000 //Still a Combat class mech - CC tech as well! 150% "normal" boundy price.
unit_name = "working marauder"
export_types = list(/obj/mecha/combat/marauder)
export_types = list(/obj/vehicle/sealed/mecha/combat/marauder)
/datum/export/large/mech/deathripley
cost = 18500 //Still a "Combat class" mech - Illegal tech as well! 165% "normal" boundy price.
unit_name = "working illegally modified"
export_types = list(/obj/mecha/working/ripley/deathripley)
export_types = list(/obj/vehicle/sealed/mecha/working/ripley/deathripley)
/datum/export/large/mech/gygaxdark
cost = 28500 //Still a Combat class mech - Illegal tech as well! 150% "normal" boundy price.
unit_name = "working illegally modified gygax"
export_types = list(/obj/mecha/combat/gygax/dark)
export_types = list(/obj/vehicle/sealed/mecha/combat/gygax/dark)
/datum/export/large/mech/oldripley
cost = 6250 //old mech - Scrap metal ! 50% "normal" boundy price.
unit_name = "working miner ripley"
export_types = list(/obj/mecha/working/ripley/mining)
export_types = list(/obj/vehicle/sealed/mecha/working/ripley/mining)
/datum/export/large/mech/honk
cost = 16000 //Still a "Combat class" mech - Comats bordem honk!
unit_name = "working honker"
export_types = list(/obj/mecha/combat/honker)
export_types = list(/obj/vehicle/sealed/mecha/combat/honker)
/datum/export/large/mech/reticence
cost = 16000 //Still a "Combat class" mech - Has cloking and lethal weaponds.
unit_name = "working reticence"
export_types = list(/obj/mecha/combat/reticence)
export_types = list(/obj/vehicle/sealed/mecha/combat/reticence)
/datum/export/large/mech/seraph
cost = 25500 //Still a Combat class mech - CC tech as well! 150% "normal" boundy price.
unit_name = "working seraph"
export_types = list(/obj/mecha/combat/marauder/seraph)
export_types = list(/obj/vehicle/sealed/mecha/combat/marauder/seraph)
/datum/export/large/mech/mauler
cost = 25000 //Still a Combat class mech - CC lethal weaponds.
unit_name = "working legally modified marauder"
export_types = list(/obj/mecha/combat/marauder/mauler)
export_types = list(/obj/vehicle/sealed/mecha/combat/marauder/mauler)
code/modules/cargo/exports/organs_robotics.dm
+1 -1
View File
@@ -163,7 +163,7 @@
cost = 150
unit_name = "mech based tool"
include_subtypes = TRUE
export_types = list(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp, /obj/item/mecha_parts/mecha_equipment/extinguisher, /obj/item/mecha_parts/mecha_equipment/rcd, /obj/item/mecha_parts/mecha_equipment/cable_layer, \
export_types = list(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp, /obj/item/mecha_parts/mecha_equipment/extinguisher, /obj/item/mecha_parts/mecha_equipment/rcd, \
/obj/item/mecha_parts/mecha_equipment/drill, /obj/item/mecha_parts/mecha_equipment/mining_scanner, /obj/item/mecha_parts/mecha_equipment/medical/sleeper)
/datum/export/robotics/mech_blue_space
code/modules/cargo/expressconsole.dm
+1 -1
View File
@@ -26,7 +26,7 @@
var/locked = TRUE //is the console locked? unlock with ID
var/usingBeacon = FALSE //is the console in beacon mode? exists to let beacon know when a pod may come in
/obj/machinery/computer/cargo/express/Initialize()
/obj/machinery/computer/cargo/express/Initialize(mapload)
. = ..()
packin_up()
code/modules/cargo/supplypod.dm
+2 -2
View File
@@ -11,7 +11,7 @@
allow_dense = TRUE
delivery_icon = null
can_weld_shut = FALSE
armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 100, BIO = 0, RAD = 0, FIRE = 100, ACID = 80)
anchored = TRUE //So it cant slide around after landing
anchorable = FALSE
flags_1 = PREVENT_CONTENTS_EXPLOSION_1
@@ -89,7 +89,7 @@
style = customStyle
setStyle(style) //Upon initialization, give the supplypod an iconstate, name, and description based on the "style" variable. This system is important for the centcom_podlauncher to function correctly
/obj/structure/closet/supplypod/extractionpod/Initialize()
/obj/structure/closet/supplypod/extractionpod/Initialize(mapload)
. = ..()
var/turf/picked_turf = pick(GLOB.holdingfacility)
reverse_dropoff_coords = list(picked_turf.x, picked_turf.y, picked_turf.z)