Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] no free merc ofd charges + add charges to uplink #1592

Merged
merged 1 commit into from
Nov 30, 2023
Merged

[MIRROR] no free merc ofd charges + add charges to uplink #1592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions baystation12.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@
#include "code\datums\uplink\services.dm"
#include "code\datums\uplink\stealth_and_camouflage_items.dm"
#include "code\datums\uplink\stealthy_and_inconspicuous_weapons.dm"
#include "code\datums\uplink\structures_and_vehicles.dm"
#include "code\datums\uplink\telecrystals.dm"
#include "code\datums\uplink\uplink_categories.dm"
#include "code\datums\uplink\uplink_items.dm"
Expand Down
34 changes: 34 additions & 0 deletions code/datums/uplink/structures_and_vehicles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/datum/uplink_item/item/structures_and_vehicles
category = /datum/uplink_category/structures_and_vehicles


/datum/uplink_item/item/structures_and_vehicles/ofd_charge_fire
name = "FR1-ENFER charge"
desc = "An obstruction field disperser charge that causes a localised fire."
antag_roles = list(MODE_MERCENARY)
item_cost = 80
path = /obj/structure/ship_munition/disperser_charge/fire


/datum/uplink_item/item/structures_and_vehicles/ofd_charge_emp
name = "EM2-QUASAR charge"
desc = "An obstruction field disperser charge that emits an electromagnetic pulse."
antag_roles = list(MODE_MERCENARY)
item_cost = 80
path = /obj/structure/ship_munition/disperser_charge/emp


/datum/uplink_item/item/structures_and_vehicles/ofd_charge_explosive
name = "XP4-INDARRA charge"
desc = "An obstruction field disperser charge that explodes."
antag_roles = list(MODE_MERCENARY)
item_cost = 80
path = /obj/structure/ship_munition/disperser_charge/explosive


/datum/uplink_item/item/structures_and_vehicles/ofd_charge_mining
name = "MN3-BERGBAU charge"
desc = "An obstruction field disperser charge that extracts ore."
antag_roles = list(MODE_MERCENARY)
item_cost = 80
path = /obj/structure/ship_munition/disperser_charge/mining
3 changes: 3 additions & 0 deletions code/datums/uplink/uplink_categories.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,8 @@
/datum/uplink_category/badassery
name = "Badassery"

/datum/uplink_category/structures_and_vehicles
name = "Structures & Vehicles"

/datum/uplink_category/telecrystals
name = "Telecrystal Materialization"
12 changes: 3 additions & 9 deletions maps/antag_spawn/mercenary/mercenary_base.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,6 @@
/obj/machinery/disperser/back{
dir = 1
},
/obj/structure/ship_munition/disperser_charge/emp,
/turf/simulated/floor/plating,
/area/map_template/merc_shuttle)
"eR" = (
Expand Down Expand Up @@ -1922,11 +1921,6 @@
},
/turf/simulated/floor/plating,
/area/map_template/merc_shuttle)
"vZ" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/floor_decal/industrial/outline/grey,
/turf/simulated/floor/tiled/dark/monotile,
/area/map_template/merc_shuttle)
"wd" = (
/obj/machinery/sleeper{
dir = 4
Expand Down Expand Up @@ -2295,11 +2289,11 @@
/turf/simulated/floor/tiled/techfloor,
/area/map_template/merc_shuttle)
"Bj" = (
/obj/floor_decal/industrial/outline/red,
/obj/machinery/light{
dir = 4
},
/obj/structure/ship_munition/disperser_charge/explosive,
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/floor_decal/industrial/outline/grey,
/turf/simulated/floor/tiled/techfloor,
/area/map_template/merc_shuttle)
"Bn" = (
Expand Down Expand Up @@ -5646,7 +5640,7 @@ tY
kZ
BA
ew
vZ
uq
qA
AF
xc
Expand Down