Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2395,6 +2395,8 @@
#include "code\game\turfs\simulated\wall_types\fancy_shuttle.dm"
#include "code\game\turfs\simulated\wall_types\material.dm"
#include "code\game\turfs\simulated\wall_types\prepainted.dm"
#include "code\game\turfs\simulated\wall_types\prepainted_wood.dm"
#include "code\game\turfs\simulated\wall_types\rusted.dm"
#include "code\game\turfs\simulated\wall_types\shuttle.dm"
#include "code\game\turfs\space\space.dm"
#include "code\game\turfs\space\transit.dm"
Expand Down Expand Up @@ -5376,6 +5378,7 @@
#include "code\modules\roles\ghostroles\roles\salvager.dm"
#include "code\modules\roles\ghostroles\roles\sapient_mob.dm"
#include "code\modules\roles\ghostroles\roles\sdf.dm"
#include "code\modules\roles\ghostroles\roles\smuggler.dm"
#include "code\modules\roles\jobs\access.dm"
#include "code\modules\roles\jobs\alt_title.dm"
#include "code\modules\roles\jobs\department.dm"
Expand Down Expand Up @@ -6114,6 +6117,7 @@
#include "maps\overmap\shuttles\pirateskiff.dm"
#include "maps\overmap\shuttles\skipjack.dm"
#include "maps\overmap\shuttles\specialops.dm"
#include "maps\sectors\vce_asteroid_field1\asteroid_field1.dm"
#include "maps\sectors\debrisfield_192\debrisfield_192.dm"
#include "maps\sectors\delerict_casino\delerict_casino-areas.dm"
#include "maps\sectors\delerict_casino\delerict_casino-misc.dm"
Expand Down Expand Up @@ -6150,6 +6154,12 @@
#include "maps\sectors\solarstar_station\solar_station_shuttle.dm"
#include "maps\sectors\surt\surt.dm"
#include "maps\sectors\surt\surt_areas.dm"
#include "maps\sectors\vce_asteroid_field1\asteroid_field1-areas.dm"
#include "maps\sectors\vce_asteroid_field1\asteroid_field1-overmap.dm"
#include "maps\sectors\vce_fleet\fleet-shuttles.dm"
#include "maps\sectors\vce_miningbase\miningbase-areas.dm"
#include "maps\sectors\vce_miningbase\miningbase-overmap.dm"
#include "maps\sectors\vce_miningbase\miningbase.dm"
#include "maps\sectors\virgo2_140\virgo2_140.dm"
#include "maps\sectors\virgo4_140\virgo4_140.dm"
#include "maps\sectors\wasteland_192\wasteland_192.dm"
Expand Down Expand Up @@ -6193,6 +6203,7 @@
#include "maps\stations\tether\telecomms.dm"
#include "maps\stations\tether\tether.dm"
#include "maps\stations-centcom\centcom.dm"
#include "maps\stations-centcom\ncv_astral\ncv_astral.dm"
#include "maps\stations-centcom\ncv_oracle\ncv_oracle.dm"
#include "maps\stations-centcom\ndv_marksman\ndv_marksman.dm"
#include "maps\stations-centcom\nts_demeter\nts_demeter.dm"
Expand Down
13 changes: 13 additions & 0 deletions code/datums/outfits/ghostrole.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,16 @@
belt = /obj/item/storage/belt/utility/full
id_slot = SLOT_ID_WORN_ID
id_type = /obj/item/card/id/external/id_slavager

//Smuggler
/datum/outfit/smuggler
name = "Smuggler"
uniform = /obj/item/clothing/under/syndicate/tacticool
l_ear = /obj/item/radio/headset/trader/outsider
shoes = /obj/item/clothing/shoes/galoshes/black
back = /obj/item/storage/backpack/industrial
id_type = /obj/item/card/id/assistant
pda_type = /obj/item/pda
belt = /obj/item/storage/belt/utility/full
id_slot = SLOT_ID_WORN_ID
id_type = /obj/item/card/id/external/id

Check failure on line 157 in code/datums/outfits/ghostrole.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Path /obj/item/card/id/external/id does not exist
109 changes: 109 additions & 0 deletions code/game/objects/structures/vce_asset.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
//custom things uced the Vacuum Crusis Expense

/obj/structure/salvageable/titan_wreck
name = "Giant Sword"
desc = "This is a hudge weapon, from another era. You might get usefull thinks out of it."

salvageable_parts = list(
/obj/item/stock_parts/console_screen = 80,
/obj/item/stack/cable_coil{amount = 5} = 80,
/obj/item/integrated_circuit = 60,
/obj/item/stack/material/steel = 60,
/obj/item/stock_parts/capacitor = 40,
/obj/item/stock_parts/scanning_module = 40,
/obj/item/stock_parts/manipulator = 40,
/obj/item/stock_parts/micro_laser = 40,
/obj/item/stock_parts/micro_laser = 40,
/obj/item/stock_parts/micro_laser = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/capacitor/adv = 20,
/obj/item/stock_parts/micro_laser/high = 20,
/obj/item/stock_parts/micro_laser/high = 20,
/obj/item/stock_parts/matter_bin/adv = 20,
/obj/item/stock_parts/matter_bin/adv = 20,
/obj/item/stack/material/steel{amount = 20} = 40,
/obj/item/stack/material/glass{amount = 20} = 40,
/obj/item/stack/material/plastic{amount = 20} = 40,
/obj/item/stack/material/plasteel{amount = 10} = 40,
/obj/item/stack/material/silver{amount = 10} = 20,
/obj/item/stack/material/gold{amount = 10} = 20,
/obj/item/stack/material/phoron{amount = 10} = 20
)

bound_x = 128
bound_y = 128


/obj/structure/salvageable/titan_wreck/gun
name = "Giant Rifle"
desc = "This is a hudge weapon, from another era. You might get usefull thinks out of it."

salvageable_parts = list(
/obj/item/stock_parts/console_screen = 80,
/obj/item/stack/cable_coil{amount = 5} = 80,
/obj/item/integrated_circuit = 60,
/obj/item/stack/material/steel = 60,
/obj/item/stock_parts/capacitor = 40,
/obj/item/stock_parts/scanning_module = 40,
/obj/item/stock_parts/manipulator = 40,
/obj/item/stock_parts/micro_laser = 40,
/obj/item/stock_parts/micro_laser = 40,
/obj/item/stock_parts/micro_laser = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/capacitor/adv = 20,
/obj/item/stock_parts/micro_laser/high = 20,
/obj/item/stock_parts/micro_laser/high = 20,
/obj/item/stock_parts/matter_bin/adv = 20,
/obj/item/stock_parts/matter_bin/adv = 20,
/obj/item/stack/material/steel{amount = 20} = 40,
/obj/item/stack/material/glass{amount = 20} = 40,
/obj/item/stack/material/plastic{amount = 20} = 40,
/obj/item/stack/material/plasteel{amount = 10} = 40,
/obj/item/stack/material/silver{amount = 10} = 20,
/obj/item/stack/material/gold{amount = 10} = 20,
/obj/item/stack/material/phoron{amount = 10} = 20
)

bound_x = 128
bound_y = 128

/obj/structure/salvageable/titan_wreck/titan
name = "wrecked titan"
desc = "Once roamed the area, fought, and represented something greated. Now, just good enough to be slavaged."

salvageable_parts = list(
/obj/item/stock_parts/console_screen = 80,
/obj/item/stack/cable_coil{amount = 5} = 80,
/obj/item/integrated_circuit = 60,
/obj/item/stack/material/steel = 60,
/obj/item/stock_parts/capacitor = 40,
/obj/item/stock_parts/scanning_module = 40,
/obj/item/stock_parts/manipulator = 40,
/obj/item/stock_parts/micro_laser = 40,
/obj/item/stock_parts/micro_laser = 40,
/obj/item/stock_parts/micro_laser = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/matter_bin = 40,
/obj/item/stock_parts/capacitor/adv = 20,
/obj/item/stock_parts/micro_laser/high = 20,
/obj/item/stock_parts/micro_laser/high = 20,
/obj/item/stock_parts/matter_bin/adv = 20,
/obj/item/stock_parts/matter_bin/adv = 20,
/obj/item/stack/material/steel{amount = 20} = 40,
/obj/item/stack/material/glass{amount = 20} = 40,
/obj/item/stack/material/plastic{amount = 20} = 40,
/obj/item/stack/material/plasteel{amount = 10} = 40,
/obj/item/stack/material/silver{amount = 10} = 20,
/obj/item/stack/material/gold{amount = 10} = 20,
/obj/item/stack/material/phoron{amount = 10} = 20
)
bound_x = 128
bound_y = 128
15 changes: 15 additions & 0 deletions code/game/turfs/simulated/flooring/flooring_premade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,13 @@
icon_state = "church_marble"
initial_flooring = /datum/prototype/flooring/roguetown/church_marble

/turf/simulated/floor/roguetown/church_marble/white
name = "white marble floor"
icon = 'icons/turf/flooring/roguetown/castle.dmi'
icon_state = "church_marble_white"
initial_flooring = /datum/prototype/flooring/roguetown/church_marble


/turf/simulated/floor/roguetown/church_brick
name = "brick floor"
icon = 'icons/turf/flooring/roguetown/castle.dmi'
Expand Down Expand Up @@ -810,3 +817,11 @@
icon = 'icons/turf/flooring/roguetown/rock.dmi'
icon_state = "rock"
initial_flooring = /datum/prototype/flooring/roguetown/rock

//Road stuff yee

/turf/simulated/floor/road
name = "road"
icon = 'icons/turf/flooring/road.dmi'

Check failure on line 825 in code/game/turfs/simulated/flooring/flooring_premade.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'icons/turf/flooring/road.dmi'

Check failure on line 825 in code/game/turfs/simulated/flooring/flooring_premade.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'icons/turf/flooring/road.dmi'

Check failure on line 825 in code/game/turfs/simulated/flooring/flooring_premade.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'icons/turf/flooring/road.dmi'

Check failure on line 825 in code/game/turfs/simulated/flooring/flooring_premade.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'icons/turf/flooring/road.dmi'
icon_state = "innermiddle"
initial_flooring = /datum/prototype/flooring/roguetown/rock
47 changes: 47 additions & 0 deletions code/game/turfs/simulated/wall_types/prepainted_wood.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
//Normal use on the Strelka.

/turf/simulated/wall/wood/hardwood/prepainted
name = "Pre-Painted Wood Wall"
color = COLOR_WALL_GUNMETAL
paint_color = COLOR_WALL_GUNMETAL

/turf/simulated/wall/wood/hardwood/prepainted/command
color = COLOR_COMMAND_BLUE
stripe_color = COLOR_COMMAND_BLUE

/turf/simulated/wall/wood/hardwood/prepainted/command/alt
color = COLOR_GOLD
stripe_color = COLOR_GOLD

/turf/simulated/wall/wood/hardwood/prepainted/security
color = COLOR_SECURITY_RED
stripe_color = COLOR_SECURITY_RED

/turf/simulated/wall/wood/hardwood/prepainted/medical
color = COLOR_BABY_BLUE
stripe_color = COLOR_BABY_BLUE

/turf/simulated/wall/wood/hardwood/prepainted/engineering
color = COLOR_SUN
stripe_color = COLOR_SUN

/turf/simulated/wall/wood/hardwood/prepainted/engineering/atmos
color = COLOR_ATMOSPHERICS_CYAN
stripe_color = COLOR_ATMOSPHERICS_CYAN

/turf/simulated/wall/wood/hardwood/prepainted/civilian
color = COLOR_PALE_BTL_GREEN
stripe_color = COLOR_PALE_BTL_GREEN

/turf/simulated/wall/wood/hardwood/prepainted/exploration
color = COLOR_EXPLO_VIOLET
stripe_color = COLOR_EXPLO_VIOLET

/turf/simulated/wall/wood/hardwood/prepainted/science
color = COLOR_PURPLE_GRAY
stripe_color = COLOR_PURPLE_GRAY

/turf/simulated/wall/wood/hardwood/prepainted/cargo
stripe_color = COLOR_CARGO_BROWN


8 changes: 8 additions & 0 deletions code/game/turfs/simulated/wall_types/rusted.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/turf/simulated/wall/r_wall/rusted
name = "Rusted Wall"
color = "#81521d"

/obj/structure/girder/reinforced/rusted
name = "Rusted Grider"
color = "#81521d"

53 changes: 53 additions & 0 deletions code/modules/roles/ghostroles/roles/smuggler.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/datum/prototype/role/ghostrole/smuggler
name = "Smuggler"
assigned_role = "smuggler"
desc = "You are a Vacuum Crucis Expanse smuggler."
spawntext = "In deep space, goods are valuable. Especially illgal goods. Weapons, drugs, contraband... Your goal is too transport those goods and make money out of it. Evade NT security, pirates, and become rich."

important_info = "Read, the SOP ! You are not antags, and can't attack NT station. However, you can defend yourself."

instantiator = /datum/ghostrole_instantiator/human/player_static/smuggler

/datum/prototype/role/ghostrole/smuggler/Instantiate(client/C, atom/loc, list/params)
return ..()

/datum/prototype/role/ghostrole/smuggler/Greet(mob/created, datum/component/ghostrole_spawnpoint/spawnpoint, list/params)
. = ..()
to_chat(created, "<i> Time to Smuggle goods ! Gear, up, get in a ship, and go ahead. Carerfull, NT exploration and security has been recruited by fleet-sec to counter smuggling !</i>")

/datum/ghostrole_instantiator/human/player_static/smuggler
equip_loadout = TRUE

/datum/ghostrole_instantiator/human/player_static/smuggler/GetOutfit(client/C, mob/M, list/params)
return new /datum/outfit/smuggler

/obj/structure/ghost_role_spawner/smuggler
name = "smuggler Long-range Teleporter"
desc = "A teleporter made to link with the fleet."
icon = 'icons/obj/machines/teleporter.dmi'
icon_state = "pad_active"
anchored = TRUE
role_type = /datum/prototype/role/ghostrole/smuggler
role_spawns = 4

//smuggler CRYO
/obj/machinery/cryopod/robot/door/travel/smuggler
name = "smuggler cryo"
desc = "A teleporter towards outpost 01."
icon = 'icons/obj/machines/sleeper.dmi'

Check failure on line 37 in code/modules/roles/ghostroles/roles/smuggler.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'icons/obj/machines/sleeper.dmi'

Check failure on line 37 in code/modules/roles/ghostroles/roles/smuggler.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'icons/obj/machines/sleeper.dmi'

Check failure on line 37 in code/modules/roles/ghostroles/roles/smuggler.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'icons/obj/machines/sleeper.dmi'

Check failure on line 37 in code/modules/roles/ghostroles/roles/smuggler.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD0404: Cannot find file 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
announce_channel = "Trade"
on_store_message = "went into cryosleep."
on_store_name = "Smuggler cryo storage"

/obj/machinery/computer/cryopod/travel/smuggler
name = "docking oversight console"
desc = "An interface between soldiers and the docking oversight systems tasked with keeping track of all smugglers who enter or exit cryo."
circuit = "/obj/item/circuitboard/robotstoragecontrol"

storage_type = "visitors"
storage_name = "smuggler Travel Oversight"
allow_items = TRUE

/obj/machinery/telecomms/allinone/smuggler
freq_listening = list(FREQ_COMMON)
Empty file added icons/mob/vce_humanoid.dmi
Empty file.
Empty file added icons/mob/vce_mob.dmi
Empty file.
Binary file added icons/mob/vce_mob_titan.dmi
Binary file not shown.
Binary file added icons/obj/vce_asset/vce_titan.dmi
Binary file not shown.
Empty file.
Binary file modified icons/turf/flooring/roguetown/castle.dmi
Binary file not shown.
Binary file added icons/turf/flooring/vce_asset_floor/road.dmi
Binary file not shown.
Empty file added icons/turf/walls/vce_asset
Empty file.
Binary file added icons/turf/walls/vce_asset_walls/vce_floor.dmi
Binary file not shown.
Binary file added icons/turf/walls/vce_asset_walls/vce_walls.dmi
Binary file not shown.
15 changes: 15 additions & 0 deletions maps/sectors/vce_asteroid_field1/asteroid_field1-areas.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/area/space/asteroidfield1
name = "Away Mission - Osiris Field"
icon = 'icons/turf/areas.dmi'
icon_state = "dark"

/area/space/asteroidfield1/explored
name = "Away Mission - Osiris Field"
icon = 'icons/turf/areas.dmi'
icon_state = "dark"

/area/space/asteroidfield1/unexplored
icon_state = "debrisunexplored"

/area/asteroidfield1
name = "\improper Asteroid field Alpha"
41 changes: 41 additions & 0 deletions maps/sectors/vce_asteroid_field1/asteroid_field1-overmap.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/obj/overmap/entity/visitable/sector/asteroid_field1
name = "Asteroid field Alpha"
desc = "A mundane asteroid field perfect for mining."
scanner_desc = @{"[b][i]Stellar Body[/b][/i]: Asteroid field Alpha
[b]Class[/b]: Level 1 Asteroid Field
[b]Habitability[/b]: Impossible
[b]Population[/b]: N/A
[b]Controlling Goverment[/b]: N/A
[b]Relationship with NT[/b]: N/A
[b]Relevant Contacts[/b]: Standard carp bank located.
[b]Ores detection[/b]: Majority of Gold / Silver / Diamond.
[b]Notes[/b]: May be used for low level mining."}
icon_state = "debrisfield"
color = "#61573c"
known = FALSE
in_space = 1


/obj/effect/step_trigger/teleporter/asteroid_field1_loop/north/Initialize(mapload)
. = ..()
teleport_x = x
teleport_y = 2
teleport_z = z

/obj/effect/step_trigger/teleporter/asteroid_field1_loop/south/Initialize(mapload)
. = ..()
teleport_x = x
teleport_y = world.maxy - 1
teleport_z = z

/obj/effect/step_trigger/teleporter/asteroid_field1_loop/west/Initialize(mapload)
. = ..()
teleport_x = world.maxx - 1
teleport_y = y
teleport_z = z

/obj/effect/step_trigger/teleporter/asteroid_field1_loop/east/Initialize(mapload)
. = ..()
teleport_x = 2
teleport_y = y
teleport_z = z
29 changes: 29 additions & 0 deletions maps/sectors/vce_asteroid_field1/asteroid_field1.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/datum/map/sector/asteroid_field1
id = "asteroidfield1"
name = "Sector - Osiris Debris Field"
width = 192
height = 192
levels = list(
/datum/map_level/sector/asteroid_field1,
)

/datum/map_level/sector/asteroid_field1
id = "asteroidfield1"
name = "Sector Crucis Expanse - Asteroid field Alpha"
display_name = "Asteroid field Alpha"
path = "maps/sectors/asteroid_field1/levels/asteroid_field1.dmm"
base_turf = /turf/space
base_area = /area/space

/datum/map_level/sector/asteroid_field1/on_loaded_immediate(z_index, list/datum/callback/additional_generation)
. = ..()
additional_generation?.Add(
CALLBACK(
GLOBAL_PROC,
GLOBAL_PROC_REF(seed_submaps),
list(z_index),
200,
/area/space,
/datum/map_template/submap/level_specific/asteroidfield1,

Check failure on line 27 in maps/sectors/vce_asteroid_field1/asteroid_field1.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

failed to resolve path /datum/map_template/submap/level_specific/asteroidfield1
)
)
Loading
Loading