cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-09 16:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

SolGov code removal - First Pass

Browse Source
This commit is contained in:
Captain277
2021-09-22 03:47:19 -07:00
parent d7d1736ce7
commit e41590d069
61 changed files with 1954 additions and 2331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
_maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm
View File

@@ -36,8 +36,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/obj/machinery/door/airlock/external,
/obj/effect/map_helper/airlock/door/ext_door,
@@ -164,13 +163,11 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/obj/machinery/airlock_sensor/airlock_interior{
dir = 8;
pixel_x = 24;
pixel_y = 0
pixel_x = 24
},
/obj/effect/map_helper/airlock/sensor/int_sensor,
/obj/effect/floor_decal/corner/brown{
@@ -212,8 +209,7 @@
"ax" = (
/obj/machinery/computer/shuttle_control/explore/tinycarrier,
/obj/effect/floor_decal/corner/blue{
dir = 5;
icon_state = "corner_white"
dir = 5
},
/turf/simulated/floor/tiled/airless{
broken = 1
@@ -250,8 +246,8 @@
"aB" = (
/obj/item/clothing/head/service,
/obj/item/clothing/head/service,
/obj/item/clothing/under/solgov/utility/fleet,
/obj/item/clothing/under/solgov/utility/fleet,
/obj/item/clothing/under/oricon/utility/fleet,
/obj/item/clothing/under/oricon/utility/fleet,
/obj/item/clothing/suit/storage/toggle/dress/fleet,
/obj/item/clothing/suit/storage/toggle/dress/fleet,
/obj/structure/closet/wardrobe/black{
@@ -267,8 +263,7 @@
"aC" = (
/obj/machinery/light_switch{
dir = 4;
pixel_x = -28;
pixel_y = 0
pixel_x = -28
},
/obj/effect/floor_decal/corner/brown{
dir = 9
@@ -279,8 +274,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/obj/effect/floor_decal/corner/brown{
dir = 4
@@ -305,7 +299,6 @@
/obj/machinery/power/apc{
dir = 1;
name = "north bump";
pixel_x = 0;
pixel_y = 24
},
/obj/structure/cable/green{
@@ -337,8 +330,7 @@
dir = 8
},
/obj/effect/floor_decal/corner/blue{
dir = 1;
icon_state = "corner_white"
dir = 1
},
/turf/simulated/floor/tiled/airless,
/area/submap/debrisfield_vr/tinyshuttle/bridge)
@@ -364,8 +356,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5;
icon_state = "intact-scrubbers"
dir = 5
},
/obj/effect/floor_decal/corner/blue{
dir = 6
@@ -420,8 +411,7 @@
icon_state = "6-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 10;
icon_state = "intact"
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -445,8 +435,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 10;
icon_state = "intact"
dir = 10
},
/turf/simulated/floor/tiled,
/area/submap/debrisfield_vr/tinyshuttle/crew)
@@ -469,8 +458,7 @@
/area/submap/debrisfield_vr/tinyshuttle/crew)
"aU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 6;
icon_state = "intact-fuel"
dir = 6
},
/turf/simulated/wall/thull,
/area/submap/debrisfield_vr/tinyshuttle/engine)
@@ -481,7 +469,6 @@
/area/submap/debrisfield_vr/tinyshuttle/bridge)
"aW" = (
/obj/machinery/computer/ship/sensors{
icon_state = "computer";
dir = 4
},
/obj/structure/cable/green{
@@ -510,21 +497,18 @@
pixel_y = -24
},
/obj/effect/floor_decal/corner/blue{
dir = 10;
icon_state = "corner_white"
dir = 10
},
/turf/simulated/floor/tiled/airless,
/area/submap/debrisfield_vr/tinyshuttle/bridge)
"aY" = (
/obj/machinery/turretid/lethal{
pixel_x = 0;
pixel_y = 4;
req_access = list()
},
/obj/structure/table/steel_reinforced,
/obj/effect/floor_decal/corner/blue{
dir = 10;
icon_state = "corner_white"
dir = 10
},
/turf/simulated/floor/tiled/airless,
/area/submap/debrisfield_vr/tinyshuttle/bridge)
@@ -542,8 +526,7 @@
pixel_y = -24
},
/obj/effect/floor_decal/corner/blue/full{
dir = 4;
icon_state = "corner_white_full"
dir = 4
},
/turf/simulated/floor/tiled/airless,
/area/submap/debrisfield_vr/tinyshuttle/bridge)
@@ -552,8 +535,7 @@
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6;
icon_state = "intact"
dir = 6
},
/turf/simulated/floor/tiled,
/area/submap/debrisfield_vr/tinyshuttle/crew)
@@ -577,8 +559,7 @@
/area/submap/debrisfield_vr/tinyshuttle/crew)
"bd" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5;
icon_state = "intact"
dir = 5
},
/obj/structure/closet/secure_closet/guncabinet/sidearm{
anchored = 1;
@@ -587,8 +568,7 @@
/obj/item/gun/projectile/p92x/large,
/obj/item/gun/projectile/p92x/large,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5;
icon_state = "intact-scrubbers"
dir = 5
},
/obj/effect/floor_decal/corner/brown/full,
/obj/item/ammo_magazine/m9mm/large,
@@ -646,8 +626,7 @@
/area/submap/debrisfield_vr/tinyshuttle/crew)
"bh" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
dir = 8;
icon_state = "map-fuel"
dir = 8
},
/turf/simulated/wall/thull,
/area/submap/debrisfield_vr/tinyshuttle/engine)
@@ -697,12 +676,10 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4;
icon_state = "map"
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -726,8 +703,7 @@
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
icon_state = "1-2"
},
/obj/structure/cable/green{
icon_state = "9-10"
@@ -772,7 +748,6 @@
"bs" = (
/obj/structure/extinguisher_cabinet{
dir = 1;
icon_state = "extinguisher_closed";
pixel_y = 32
},
/obj/structure/table/steel,
@@ -792,7 +767,6 @@
},
/obj/structure/extinguisher_cabinet{
dir = 4;
icon_state = "extinguisher_closed";
pixel_x = -30
},
/obj/machinery/atmospherics/portables_connector{
@@ -824,8 +798,7 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4;
icon_state = "map"
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -865,8 +838,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9;
icon_state = "intact"
dir = 9
},
/obj/machinery/light_switch{
dir = 8;
@@ -922,8 +894,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5;
icon_state = "intact-scrubbers"
dir = 5
},
/turf/simulated/floor/tiled/steel_ridged,
/area/submap/debrisfield_vr/tinyshuttle/engine)
@@ -970,8 +941,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5;
icon_state = "intact-scrubbers"
dir = 5
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -983,7 +953,6 @@
/area/submap/debrisfield_vr/tinyshuttle/engine)
"bK" = (
/obj/machinery/atmospherics/portables_connector/fuel{
icon_state = "map_connector-fuel";
dir = 4
},
/obj/effect/floor_decal/corner/orange{
@@ -1018,12 +987,10 @@
/area/submap/debrisfield_vr/tinyshuttle/engine)
"bN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 10;
icon_state = "intact-fuel"
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5;
icon_state = "intact"
dir = 5
},
/obj/effect/decal/cleanable/liquid_fuel,
/obj/item/multitool,
@@ -1055,7 +1022,6 @@
/area/submap/debrisfield_vr/tinyshuttle/engine)
"bR" = (
/obj/machinery/atmospherics/portables_connector/fuel{
icon_state = "map_connector-fuel";
dir = 4
},
/obj/machinery/portable_atmospherics/canister/empty/phoron{
@@ -1110,8 +1076,7 @@
/area/submap/debrisfield_vr/tinyshuttle/hangar)
"bY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 5;
icon_state = "intact-fuel"
dir = 5
},
/turf/simulated/wall/thull,
/area/submap/debrisfield_vr/tinyshuttle/engine)
@@ -1145,8 +1110,7 @@
/area/submap/debrisfield_vr/tinyshuttle/hangar)
"ce" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 8;
icon_state = "intact-fuel"
dir = 8
},
/obj/machinery/meter,
/obj/machinery/light_switch{
@@ -1174,7 +1138,6 @@
/area/submap/debrisfield_vr/tinyshuttle/hangar)
"ch" = (
/obj/machinery/atmospherics/binary/pump/fuel{
icon_state = "map_off-fuel";
dir = 4
},
/obj/machinery/alarm/alarms_hidden{

2
_maps/submaps/level_specific/virgo2/GovPatrol.dmm
View File

@@ -29,7 +29,7 @@
/turf/simulated/mineral/floor/ignore_mapgen/virgo2,
/area/submap/virgo2/GovPatrol)
"i" = (
/obj/item/clothing/under/solgov/utility/sifguard,
/obj/item/clothing/under/oricon/utility/sysguard,
/obj/item/clothing/shoes/boots/jackboots,
/obj/effect/decal/remains,
/turf/simulated/mineral/floor/ignore_mapgen/virgo2,

2
_maps/submaps/wilderness/GovPatrol.dmm
View File

@@ -25,7 +25,7 @@
/turf/template_noop,
/area/submap/GovPatrol)
"h" = (
/obj/item/clothing/under/solgov/utility/sifguard,
/obj/item/clothing/under/oricon/utility/sysguard,
/obj/item/clothing/shoes/boots/jackboots,
/obj/effect/decal/remains,
/turf/template_noop,

38
_maps/templates/admin/ert.dmm
View File

@@ -516,9 +516,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/barracks)
"es" = (
/obj/structure/closet/crate{
dir = 2
},
/obj/structure/closet/crate,
/obj/item/ammo_magazine/m9mml/ap,
/obj/item/ammo_magazine/m9mml/ap,
/obj/item/ammo_magazine/m9mml/ap,
@@ -3084,18 +3082,18 @@
/obj/item/gun/projectile/p92x,
/obj/item/gun/projectile/p92x,
/obj/item/gun/projectile/p92x,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/armoury_st)
"xi" = (
@@ -4351,9 +4349,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/armoury_st)
"FT" = (
/obj/structure/closet/crate{
dir = 2
},
/obj/structure/closet/crate,
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/armoury_st)
@@ -4895,8 +4891,7 @@
/area/ship/ert/hallways)
"Jx" = (
/obj/item/perfect_tele_beacon{
tele_name = "NRB Robineau";
tele_name = "NRB Robineau"
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/ert_ship_boat)
@@ -5382,8 +5377,7 @@
/area/ship/ert/armoury_st)
"Mv" = (
/obj/item/perfect_tele_beacon{
tele_name = "NRV Von Braun Teleporter Room";
tele_name = "NRV Von Braun Teleporter Room"
},
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/teleporter)

73
_maps/templates/admin/ert_base.dmm
View File

@@ -31,7 +31,6 @@
id_tag = "ert_shuttle_bay";
name = "shuttle bay controller";
pixel_x = 25;
pixel_y = 0;
tag_door = "ert_shuttle_bay_door"
},
/turf/unsimulated/floor{
@@ -40,7 +39,6 @@
/area/centcom/specops)
"ah" = (
/obj/effect/floor_decal/industrial/danger/corner{
icon_state = "dangercorner";
dir = 1
},
/turf/unsimulated/floor/steel,
@@ -159,7 +157,6 @@
/area/shuttle/specops/centcom)
"at" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 2;
frequency = 1380;
id_tag = "ert1_vent"
},
@@ -184,11 +181,9 @@
/area/shuttle/specops/centcom)
"au" = (
/obj/machinery/light/small{
dir = 4;
pixel_y = 0
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 2;
frequency = 1380;
id_tag = "ert1_vent"
},
@@ -201,15 +196,14 @@
/area/shuttle/specops/centcom)
"av" = (
/obj/structure/shuttle/engine/heater{
icon_state = "heater";
dir = 4
},
/turf/simulated/shuttle/plating/airless,
/area/shuttle/specops/centcom)
"aw" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r";
dir = 4
dir = 4;
icon_state = "propulsion_r"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
@@ -310,7 +304,6 @@
/area/shuttle/specops/centcom)
"aK" = (
/obj/machinery/atmospherics/pipe/simple/visible{
icon_state = "intact";
dir = 6
},
/obj/machinery/meter,
@@ -330,7 +323,6 @@
/area/shuttle/specops/centcom)
"aM" = (
/obj/machinery/atmospherics/pipe/simple/visible{
icon_state = "intact";
dir = 9
},
/turf/simulated/shuttle/floor/black,
@@ -409,8 +401,7 @@
/area/shuttle/specops/centcom)
"aR" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
dir = 4
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/specops/centcom)
@@ -546,9 +537,7 @@
/area/shuttle/specops/centcom)
"bc" = (
/obj/machinery/light{
dir = 8;
icon_state = "tube1";
pixel_y = 0
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/space_heater,
@@ -570,8 +559,8 @@
/area/shuttle/specops/centcom)
"bg" = (
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_l";
dir = 4
dir = 4;
icon_state = "propulsion_l"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
@@ -618,7 +607,6 @@
/area/shuttle/specops/centcom)
"bl" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 1
},
/turf/simulated/shuttle/floor/black,
@@ -671,8 +659,7 @@
/area/shuttle/specops/centcom)
"bs" = (
/obj/structure/closet/medical_wall{
pixel_x = 32;
pixel_y = 0
pixel_x = 32
},
/obj/item/storage/firstaid/clotting,
/obj/item/storage/firstaid/bonemed,
@@ -690,7 +677,6 @@
/area/shuttle/specops/centcom)
"bt" = (
/obj/machinery/door/airlock/multi_tile/glass{
dir = 4;
req_access = list(103)
},
/turf/simulated/shuttle/floor/black,
@@ -718,14 +704,14 @@
"bw" = (
/obj/structure/window/reinforced,
/obj/structure/table/rack/steel,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/preban,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/ammo_magazine/m9mm/large/licensed,
/obj/item/gun/projectile/p92x,
/obj/item/gun/projectile/p92x,
/obj/item/gun/projectile/p92x,
@@ -842,7 +828,6 @@
/area/shuttle/specops/centcom)
"bG" = (
/obj/machinery/atm{
pixel_x = 0;
pixel_y = 26
},
/turf/simulated/shuttle/floor/black,
@@ -857,8 +842,7 @@
/obj/machinery/vending/nifsoft_shop{
categories = 111;
emagged = 1;
name = "Hacked NIFSoft Shop";
prices = list()
name = "Hacked NIFSoft Shop"
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/specops/centcom)
@@ -869,9 +853,7 @@
/turf/simulated/shuttle/floor/darkred,
/area/shuttle/specops/centcom)
"bK" = (
/obj/machinery/sleep_console{
dir = 8
},
/obj/machinery/sleep_console,
/turf/simulated/shuttle/floor/black,
/area/shuttle/specops/centcom)
"bL" = (
@@ -904,7 +886,6 @@
/area/shuttle/specops/centcom)
"bP" = (
/obj/structure/sink{
icon_state = "sink";
dir = 8;
pixel_x = -12;
pixel_y = 2
@@ -914,7 +895,6 @@
/area/shuttle/specops/centcom)
"bQ" = (
/obj/structure/mirror{
pixel_x = 0;
pixel_y = 28
},
/turf/simulated/shuttle/floor/white,
@@ -980,8 +960,7 @@
dir = 4
},
/obj/item/perfect_tele_beacon{
tele_name = "ERT";
tele_name = "ERT"
},
/obj/machinery/newscaster{
pixel_x = 32
@@ -1155,7 +1134,6 @@
/area/shuttle/specops/centcom)
"co" = (
/obj/machinery/computer/shuttle_control/multi/specops{
icon_state = "computer";
dir = 4
},
/turf/simulated/shuttle/floor/black,
@@ -1263,7 +1241,6 @@
/obj/structure/medical_stand,
/obj/structure/sink{
dir = 4;
icon_state = "sink";
pixel_x = 12;
pixel_y = 8
},
@@ -1354,8 +1331,7 @@
/area/shuttle/specops/centcom)
"cI" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
dir = 4
},
/obj/structure/table/steel_reinforced,
/obj/item/storage/firstaid/surgery,
@@ -1487,7 +1463,6 @@
/area/shuttle/specops/centcom)
"cW" = (
/obj/machinery/atmospherics/pipe/tank/air{
dir = 2;
start_pressure = 740.5
},
/obj/effect/floor_decal/industrial/outline,
@@ -1746,9 +1721,7 @@
"dA" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/light{
dir = 8;
icon_state = "tube1";
pixel_y = 0
dir = 8
},
/obj/machinery/shield_gen/external,
/turf/simulated/shuttle/floor/black,
@@ -2030,8 +2003,7 @@
/area/shuttle/specops/centcom)
"eb" = (
/obj/machinery/light/small{
dir = 4;
pixel_y = 0
dir = 4
},
/obj/machinery/airlock_sensor{
frequency = 1381;
@@ -2088,7 +2060,6 @@
/area/centcom/specops)
"eg" = (
/obj/effect/floor_decal/industrial/danger/corner{
icon_state = "dangercorner";
dir = 8
},
/turf/unsimulated/floor/steel,

495
_maps/templates/shuttles/overmaps/generic/cruiser.dmm
View File

File diff suppressed because it is too large Load Diff

52
_maps/templates/shuttles/overmaps/generic/shelter_6.dmm
View File

@@ -45,10 +45,10 @@
/obj/item/clothing/suit/armor/pcarrier/blue/sol,
/obj/item/clothing/suit/armor/pcarrier/blue/sol,
/obj/item/clothing/suit/armor/pcarrier/blue/sol,
/obj/item/clothing/head/helmet/solgov,
/obj/item/clothing/head/helmet/solgov,
/obj/item/clothing/head/helmet/solgov,
/obj/item/clothing/head/helmet/solgov,
/obj/item/clothing/head/helmet/oricon,
/obj/item/clothing/head/helmet/oricon,
/obj/item/clothing/head/helmet/oricon,
/obj/item/clothing/head/helmet/oricon,
/obj/item/clothing/accessory/storage/pouches/large/blue,
/obj/item/clothing/accessory/storage/pouches/large/blue,
/obj/item/clothing/accessory/storage/pouches/large/blue,
@@ -359,7 +359,6 @@
dir = 8
},
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 8
},
/obj/machinery/button/remote/blast_door{
@@ -371,8 +370,7 @@
/area/shuttle/tabiranth)
"al" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 1;
icon_state = "map"
dir = 1
},
/obj/machinery/suit_cycler{
density = 0;
@@ -385,7 +383,6 @@
dir = 4
},
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 4
},
/obj/machinery/button/remote/blast_door{
@@ -408,8 +405,7 @@
"ao" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 10;
icon_state = "intact"
dir = 10
},
/turf/simulated/floor/reinforced,
/area/shuttle/tabiranth)
@@ -438,7 +434,6 @@
dir = 4
},
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 8
},
/turf/simulated/floor/reinforced,
@@ -452,7 +447,6 @@
dir = 8
},
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 4
},
/turf/simulated/floor/reinforced,
@@ -492,8 +486,7 @@
start_pressure = 8559.63
},
/obj/machinery/light{
dir = 8;
icon_state = "tube1"
dir = 8
},
/turf/simulated/floor/reinforced,
/area/shuttle/tabiranth)
@@ -555,7 +548,6 @@
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/effect/map_helper/airlock/sensor/chamber_sensor,
/obj/machinery/light/small{
icon_state = "bulb1";
dir = 1
},
/obj/structure/handrail{
@@ -569,7 +561,6 @@
dir = 1
},
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 8
},
/obj/machinery/recharger/wallcharger{
@@ -651,7 +642,6 @@
dir = 1
},
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
dir = 4
},
/obj/machinery/recharger/wallcharger{
@@ -1095,9 +1085,7 @@
/turf/simulated/floor/tiled/white,
/area/shuttle/tabiranth)
"bc" = (
/obj/machinery/sleep_console{
dir = 8
},
/obj/machinery/sleep_console,
/turf/simulated/floor/tiled/white,
/area/shuttle/tabiranth)
"bd" = (
@@ -1107,8 +1095,7 @@
icon_state = "1-2"
},
/obj/item/perfect_tele_beacon{
tele_name = "Tabiranth";
tele_name = "Tabiranth"
},
/obj/effect/floor_decal/industrial/hatch,
/turf/simulated/floor/tiled/white,
@@ -1522,8 +1509,7 @@
dir = 4
},
/obj/machinery/light/small{
dir = 4;
pixel_y = 0
dir = 4
},
/obj/machinery/atm,
/turf/simulated/floor/tiled/techfloor/grid,
@@ -1536,8 +1522,7 @@
req_access = list(101)
},
/obj/machinery/light/small{
dir = 8;
pixel_x = 0
dir = 8
},
/obj/machinery/recharger,
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
@@ -1549,7 +1534,6 @@
frequency = 1380
},
/obj/machinery/light/small{
icon_state = "bulb1";
dir = 1
},
/obj/machinery/airlock_sensor{
@@ -1573,20 +1557,17 @@
/area/shuttle/tabiranth)
"bu" = (
/obj/machinery/computer/ship/engines{
dir = 8;
icon_state = "computer"
dir = 8
},
/obj/machinery/light/small{
dir = 4;
pixel_y = 0
dir = 4
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/tabiranth)
"bv" = (
/obj/structure/medical_stand,
/obj/machinery/light{
dir = 8;
icon_state = "tube1"
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/shuttle/tabiranth)
@@ -1610,14 +1591,12 @@
density = 0
},
/obj/effect/floor_decal/techfloor{
icon_state = "techfloor_edges";
dir = 6
},
/obj/machinery/vending/nifsoft_shop{
categories = 111;
emagged = 1;
name = "Hacked NIFSoft Shop";
prices = list()
name = "Hacked NIFSoft Shop"
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/tabiranth)
@@ -1647,7 +1626,6 @@
"bC" = (
/obj/machinery/organ_printer/flesh/full,
/obj/structure/sink/kitchen{
icon_state = "sink_alt";
dir = 4;
pixel_x = -13
},

8
code/datums/outfits/military/fleet.dm
View File

@@ -1,21 +1,21 @@
/decl/hierarchy/outfit/military/fleet/pt
name = OUTFIT_MILITARY("Fleet PT")
uniform = /obj/item/clothing/under/solgov/pt/fleet
uniform = /obj/item/clothing/under/oricon/pt/fleet
shoes = /obj/item/clothing/shoes/black
/decl/hierarchy/outfit/military/fleet/utility
name = OUTFIT_MILITARY("Fleet Utility")
uniform = /obj/item/clothing/under/solgov/utility/fleet
uniform = /obj/item/clothing/under/oricon/utility/fleet
shoes = /obj/item/clothing/shoes/boots/duty
/decl/hierarchy/outfit/military/fleet/service
name = OUTFIT_MILITARY("Fleet Service")
uniform = /obj/item/clothing/under/solgov/service/fleet
uniform = /obj/item/clothing/under/oricon/service/fleet
shoes = /obj/item/clothing/shoes/dress/white
/decl/hierarchy/outfit/military/fleet/dress
name = OUTFIT_MILITARY("Fleet Dress")
uniform = /obj/item/clothing/under/solgov/service/fleet
uniform = /obj/item/clothing/under/oricon/service/fleet
shoes = /obj/item/clothing/shoes/dress/white
suit = /obj/item/clothing/suit/storage/toggle/dress/fleet
gloves = /obj/item/clothing/gloves/white

8
code/datums/outfits/military/marines.dm
View File

@@ -1,22 +1,22 @@
/decl/hierarchy/outfit/military/marine/pt
name = OUTFIT_MILITARY("Marine PT")
uniform = /obj/item/clothing/under/solgov/pt/marine
uniform = /obj/item/clothing/under/oricon/pt/marine
shoes = /obj/item/clothing/shoes/black
/decl/hierarchy/outfit/military/marine/utility
name = OUTFIT_MILITARY("Marine Utility")
uniform = /obj/item/clothing/under/solgov/utility/marine
uniform = /obj/item/clothing/under/oricon/utility/marine
shoes = /obj/item/clothing/shoes/boots/jungle
/decl/hierarchy/outfit/military/marine/service
name = OUTFIT_MILITARY("Marine Service")
uniform = /obj/item/clothing/under/solgov/service/marine
uniform = /obj/item/clothing/under/oricon/service/marine
shoes = /obj/item/clothing/shoes/dress
suit = /obj/item/clothing/suit/storage/service/marine
/decl/hierarchy/outfit/military/marine/dress
name = OUTFIT_MILITARY("Marine Dress")
uniform = /obj/item/clothing/under/solgov/mildress/marine
uniform = /obj/item/clothing/under/oricon/mildress/marine
shoes = /obj/item/clothing/shoes/dress/white
suit = /obj/item/clothing/suit/dress/marine
gloves = /obj/item/clothing/gloves/white

23
code/datums/outfits/military/sifguard.dm
View File

@@ -1,23 +0,0 @@
/decl/hierarchy/outfit/military/sifguard/pt
name = OUTFIT_MILITARY("SifGuard PT")
uniform = /obj/item/clothing/under/solgov/pt/sifguard
shoes = /obj/item/clothing/shoes/black
/decl/hierarchy/outfit/military/sifguard/utility
name = OUTFIT_MILITARY("SifGuard Utility")
uniform = /obj/item/clothing/under/solgov/utility/sifguard
shoes = /obj/item/clothing/shoes/boots/tactical
/decl/hierarchy/outfit/military/sifguard/service
name = OUTFIT_MILITARY("SifGuard Service")
uniform = /obj/item/clothing/under/solgov/utility/sifguard
shoes = /obj/item/clothing/shoes/boots/tactical
suit = /obj/item/clothing/suit/storage/service/sifguard
/decl/hierarchy/outfit/military/sifguard/dress
name = OUTFIT_MILITARY("SifGuard Dress")
uniform = /obj/item/clothing/under/solgov/mildress/sifguard
shoes = /obj/item/clothing/shoes/dress
suit = /obj/item/clothing/suit/dress/expedition
gloves = /obj/item/clothing/gloves/white
head = /obj/item/clothing/head/dress/expedition

23
code/datums/outfits/military/sysguard.dm Normal file
View File

@@ -0,0 +1,23 @@
/decl/hierarchy/outfit/military/sysguard/pt
name = OUTFIT_MILITARY("SysGuard PT")
uniform = /obj/item/clothing/under/oricon/pt/sysguard
shoes = /obj/item/clothing/shoes/black
/decl/hierarchy/outfit/military/sysguard/utility
name = OUTFIT_MILITARY("SysGuard Utility")
uniform = /obj/item/clothing/under/oricon/utility/sysguard
shoes = /obj/item/clothing/shoes/boots/tactical
/decl/hierarchy/outfit/military/sysguard/service
name = OUTFIT_MILITARY("SysGuard Service")
uniform = /obj/item/clothing/under/oricon/utility/sysguard
shoes = /obj/item/clothing/shoes/boots/tactical
suit = /obj/item/clothing/suit/storage/service/sysguard
/decl/hierarchy/outfit/military/sysguard/dress
name = OUTFIT_MILITARY("SysGuard Dress")
uniform = /obj/item/clothing/under/oricon/mildress/sysguard
shoes = /obj/item/clothing/shoes/dress
suit = /obj/item/clothing/suit/dress/expedition
gloves = /obj/item/clothing/gloves/white
head = /obj/item/clothing/head/dress/expedition

14
code/datums/outfits/outfit.dm
View File

@@ -191,7 +191,7 @@ var/list/outfits_decls_by_type_
/decl/hierarchy/outfit/USDF/Marine
name = "USDF marine"
uniform = /obj/item/clothing/under/solgov/utility/marine/green
uniform = /obj/item/clothing/under/oricon/utility/marine/green
shoes = /obj/item/clothing/shoes/boots/jackboots
gloves = /obj/item/clothing/gloves/combat
l_ear = /obj/item/radio/headset/centcom
@@ -221,7 +221,7 @@ var/list/outfits_decls_by_type_
head = /obj/item/clothing/head/dress/marine/command/admiral
shoes = /obj/item/clothing/shoes/boots/jackboots
l_ear = /obj/item/radio/headset/centcom
uniform = /obj/item/clothing/under/solgov/mildress/marine/command
uniform = /obj/item/clothing/under/oricon/mildress/marine/command
back = /obj/item/storage/backpack/satchel
belt = /obj/item/gun/projectile/revolver/consul
l_pocket = /obj/item/ammo_magazine/s44
@@ -239,8 +239,8 @@ var/list/outfits_decls_by_type_
C.registered_name = H.real_name
return C
/decl/hierarchy/outfit/solgov/representative
name = "SolGov Representative"
/decl/hierarchy/outfit/oricon/representative
name = "Confederation Representative"
shoes = /obj/item/clothing/shoes/laceup
l_ear = /obj/item/radio/headset/centcom
uniform = /obj/item/clothing/under/suit_jacket/navy
@@ -250,13 +250,13 @@ var/list/outfits_decls_by_type_
r_hand = /obj/item/pda/centcom
l_hand = /obj/item/clipboard
/decl/hierarchy/outfit/solgov/representative/equip_id(mob/living/carbon/human/H)
/decl/hierarchy/outfit/oricon/representative/equip_id(mob/living/carbon/human/H)
var/obj/item/card/id/C = ..()
C.name = "[H.real_name]'s SolGov ID Card"
C.name = "[H.real_name]'s OriCon ID Card"
C.icon_state = "lifetime"
C.access = get_all_station_access()
C.access += get_all_centcom_access()
C.assignment = "SolGov Representative"
C.assignment = "OriCon Representative"
C.registered_name = H.real_name
return C

6
code/game/gamemodes/events/holidays/Holidays.dm
View File

@@ -106,13 +106,13 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
if(6) //Jun
switch(DD)
if(6)
Holiday["Sapient Rights Day"] = "This holiday celebrates the passing of the Declaration of Sapient Rights by SolGov, which guarantees the \
Holiday["Sapient Rights Day"] = "This holiday celebrates the passing of the Declaration of Sapient Rights by OriCon, which guarantees the \
same protections humans are granted to all sapient, living species."
if(14)
Holiday["Blood Donor Day"] = "This holiday was created to raise awareness of the need for safe blood and blood products, \
and to thank blood donors for their voluntary, life-saving gifts of blood."
if(20)
Holiday["Civil Servant's Day"] = "Civil Servant's Day is a holiday observed in SCG member states that honors civil servants everywhere,\
Holiday["Civil Servant's Day"] = "Civil Servant's Day is a holiday observed in OCG member states that honors civil servants everywhere,\
+ (especially those who are members of the armed forces and the emergency services), or have been or have been civil servants in the past."
if(7) //Jul
@@ -182,7 +182,7 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
if(10)
Holiday["Human-Rights Day"] = "An old holiday created by an intergovernmental organization known back than as the United Nations, \
human rights were not recognized globally at the time, and the holiday was made in honor of the Universal Declaration of Human Rights. \
These days, SolGov ensures that past efforts were not in vein, and continues to honor this holiday across the galaxy."
These days, OriCon ensures that past efforts were not in vain, and continues to honor this holiday across the galaxy."
if(22)
Holiday["Vertalliq-qixim"] = "A Skrellian holiday that celebrates the Skrell's first landing on one of \
their moons. It's often celebrated with grand festivals."

2
code/game/mecha/equipment/weapons/ballistic/automatic.dm
View File

@@ -1,6 +1,6 @@
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
name = "\improper Ultra AC 2"
desc = "A superior version of the standard Solgov Autocannon MK2 design."
desc = "A superior version of the standard Hephaestus Autocannon MK2 design."
icon_state = "mecha_uac2"
equip_cooldown = 10
projectile = /obj/item/projectile/bullet/pistol/medium

3
code/game/objects/banners.dm
View File

@@ -25,7 +25,7 @@
desc = "A banner with NanoTrasen's logo on it."
catalogue_data = list(/datum/category_item/catalogue/information/organization/nanotrasen)
/obj/item/banner/theorionconfederation
/obj/item/banner/oricon
name = "\improper the orion confederation banner"
icon_state = "banner-solgov"
desc = "A banner with the symbol of The Orion Confederation Government."
@@ -36,3 +36,4 @@
icon_state = "banner-virgov"
desc = "A banner with the symbol of the local government, the Vir Governmental Authority, also known as VirGov."
//catalogue_data = list(/datum/category_item/catalogue/information/organization/virgov)
//This one can just be removed once we're off Virgo.

2
code/game/objects/effects/decals/posters/polarisposters.dm
View File

@@ -195,12 +195,14 @@
name = "NanoTrasen"
desc = "This poster showcases an NT emblem. There is writing in the ring around the inner points, probably some sort of slogan no one bothers to memorize."
/* Replace this eventually?
/datum/poster/nanotrasen/nt_7
icon_state = "ntposter07"
name = "SolGov"
desc = "This poster showcases an SCG emblem. The outer ring reads,\
\"<font face='times new roman ms'>NIL MORTALIBUS ARDUI EST</font>\".\
Solar Confederate Government."
*/
/datum/poster/nanotrasen/nt_8
icon_state = "ntposter08"

4
code/game/objects/items/contraband.dm
View File

@@ -123,7 +123,7 @@
/obj/item/rig/combat,
/obj/item/shield/energy,
/obj/item/stamp/centcomm,
/obj/item/stamp/solgov,
/obj/item/stamp/oricon,
/obj/item/storage/fancy/cigar/havana,
/obj/item/storage/fancy/cigar/cohiba,
/obj/item/xenos_claw,
@@ -201,7 +201,7 @@
/obj/item/rig/combat,
/obj/item/shield/energy,
/obj/item/stamp/centcomm,
/obj/item/stamp/solgov,
/obj/item/stamp/oricon,
/obj/item/storage/fancy/cigar/havana,
/obj/item/storage/fancy/cigar/cohiba,
/obj/item/storage/belt/spike_bandolier,

1
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -162,7 +162,6 @@
/obj/item/clothing/under/rank/head_of_security/corp,
/obj/item/clothing/under/rank/head_of_security/skirt_pleated,
/obj/item/clothing/under/rank/head_of_security/skirt_pleated/alt,
/obj/item/clothing/under/solgov/mildress/marine/command,
/obj/item/clothing/suit/storage/vest/hoscoat/jensen,
/obj/item/clothing/suit/storage/vest/hoscoat,
/obj/item/clothing/suit/dress/marine/command/hos,

4
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -328,8 +328,8 @@
/datum/gear/accessory/pilotpin
display_name = "Pilot - Qualification Pin"
description = "An iron pin denoting the qualification to fly SCG voidcraft."
path = /obj/item/clothing/accessory/solgov/specialty/pilot
description = "An iron pin denoting the qualification to fly OCG voidcraft."
path = /obj/item/clothing/accessory/oricon/specialty/pilot
/datum/gear/accessory/flops
display_name = "Drop Straps"

18
code/modules/client/preference_setup/loadout/loadout_head.dm
View File

@@ -287,17 +287,17 @@
display_name = "Slime hat"
path = /obj/item/clothing/head/collectable/slime
/datum/gear/head/beret/sol
display_name = "Sol Beret Selection"
path = /obj/item/clothing/head/beret/sol
/datum/gear/head/beret/orion
display_name = "Orion Beret Selection"
path = /obj/item/clothing/head/beret/orion
/datum/gear/head/beret/sol/New()
/datum/gear/head/beret/orion/New()
..()
var/list/sols = list()
for(var/sol_style in typesof(/obj/item/clothing/head/beret/sol))
var/obj/item/clothing/head/beret/sol/sol = sol_style
sols[initial(sol.name)] = sol
gear_tweaks += new/datum/gear_tweak/path(sortTim(sols, /proc/cmp_text_asc))
var/list/orions = list()
for(var/orion_style in typesof(/obj/item/clothing/head/beret/orion))
var/obj/item/clothing/head/beret/orion/orion = orion_style
orions[initial(orion.name)] = orion
gear_tweaks += new/datum/gear_tweak/path(sortTim(orions, /proc/cmp_text_asc))
/datum/gear/head/surgery
display_name = "Surgical Cap Selection"

36
code/modules/client/preference_setup/loadout/loadout_role_restricted.dm
View File

@@ -342,7 +342,7 @@
/datum/gear/restricted/security/uniform/turtleneck/alt
display_name = "Security Turtleneck - Alternative"
path = /obj/item/clothing/under/solgov/utility/sifguard/crew/security
path = /obj/item/clothing/under/oricon/utility/sysguard/crew/security
/datum/gear/restricted/security/uniform/bodysuit
display_name = "Security Bodysuit"
@@ -355,11 +355,11 @@
/datum/gear/restricted/security/uniform/coveralls
display_name = "Security Uniform - Coveralls"
path = /obj/item/clothing/under/solgov/utility/fleet/security
path = /obj/item/clothing/under/oricon/utility/fleet/security
/datum/gear/restricted/security/uniform/fatigues
display_name = "Security Uniform - Fatigues" //You marine larper.
path = /obj/item/clothing/under/solgov/utility/marine/security
path = /obj/item/clothing/under/oricon/utility/marine/security
//Back
@@ -494,15 +494,15 @@
/datum/gear/restricted/medical/uniform/turtleneck/alt
display_name = "Medical Turtleneck - Alternative"
path = /obj/item/clothing/under/solgov/utility/sifguard/crew/medical
path = /obj/item/clothing/under/oricon/utility/sysguard/crew/medical
/datum/gear/restricted/medical/uniform/coveralls
display_name = "Medical Uniform - Coveralls"
path = /obj/item/clothing/under/solgov/utility/fleet/medical
path = /obj/item/clothing/under/oricon/utility/fleet/medical
/datum/gear/restricted/medical/uniform/fatigues
display_name = "Medical Uniform - Fatigues"
path = /obj/item/clothing/under/solgov/utility/marine/medical
path = /obj/item/clothing/under/oricon/utility/marine/medical
/datum/gear/restricted/medical/uniform/paramedic
display_name = "Medical Uniform - Paramedic Light"
@@ -645,15 +645,15 @@
/datum/gear/restricted/engineering/uniform/turtleneck/alt
display_name = "Engineering Turtleneck - Alt"
path = /obj/item/clothing/under/solgov/utility/sifguard/crew/engineering
path = /obj/item/clothing/under/oricon/utility/sysguard/crew/engineering
/datum/gear/restricted/engineering/uniform/coveralls
display_name = "Engineering Uniform - Coveralls"
path = /obj/item/clothing/under/solgov/utility/fleet/engineering
path = /obj/item/clothing/under/oricon/utility/fleet/engineering
/datum/gear/restricted/engineering/uniform/fatigues
display_name = "Engineering Uniform - Fatigues"
path = /obj/item/clothing/under/solgov/utility/marine/engineering
path = /obj/item/clothing/under/oricon/utility/marine/engineering
//Suit
/datum/gear/restricted/engineering/suit/wintercoat
@@ -755,15 +755,15 @@
/datum/gear/restricted/supply/uniform/turtleneck
display_name = "Cargo Turtleneck"
path = /obj/item/clothing/under/solgov/utility/sifguard/crew/supply
path = /obj/item/clothing/under/oricon/utility/sysguard/crew/supply
/datum/gear/restricted/supply/uniform/coveralls
display_name = "Cargo Uniform - Coveralls"
path = /obj/item/clothing/under/solgov/utility/fleet/supply
path = /obj/item/clothing/under/oricon/utility/fleet/supply
/datum/gear/restricted/supply/uniform/fatigues
display_name = "Cargo Uniform - Fatigues"
path = /obj/item/clothing/under/solgov/utility/marine/supply
path = /obj/item/clothing/under/oricon/utility/marine/supply
//Suit
/datum/gear/restricted/supply/suit/snowsuit
@@ -850,15 +850,15 @@
/datum/gear/restricted/science/uniform/turtleneck/alt
display_name = "Science Turtleneck - Alt"
path = /obj/item/clothing/under/solgov/utility/sifguard/crew/research
path = /obj/item/clothing/under/oricon/utility/sysguard/crew/research
/datum/gear/restricted/science/uniform/coveralls
display_name = "Science Uniform - Coveralls"
path = /obj/item/clothing/under/solgov/utility/fleet/exploration
path = /obj/item/clothing/under/oricon/utility/fleet/exploration
/datum/gear/restricted/science/uniform/fatigues
display_name = "Science Uniform - Fatigues"
path = /obj/item/clothing/under/solgov/utility/marine/exploration
path = /obj/item/clothing/under/oricon/utility/marine/exploration
//Suit
@@ -941,7 +941,7 @@
//Uniform
/datum/gear/restricted/command/uniform/coveralls
display_name = "Command Uniform - Coveralls"
path = /obj/item/clothing/under/solgov/utility/fleet/command
path = /obj/item/clothing/under/oricon/utility/fleet/command
/datum/gear/restricted/command/uniform/hop_dress
display_name = "Head of Personnel Uniform - Dress"
@@ -960,7 +960,7 @@
/datum/gear/restricted/command/uniform/turtleneck
display_name = "Command Uniform - Turtleneck"
path = /obj/item/clothing/under/solgov/utility/sifguard/officer/crew
path = /obj/item/clothing/under/oricon/utility/sysguard/officer/crew
/datum/gear/restricted/command/uniform/bridge_officer
display_name = "Bridge Officer Uniform"
@@ -974,7 +974,7 @@
/datum/gear/restricted/command/uniform/fatigues
display_name = "Command Uniform - Fatigues"
path = /obj/item/clothing/under/solgov/utility/marine/command
path = /obj/item/clothing/under/oricon/utility/marine/command
/datum/gear/restricted/command/uniform/bodysuit
display_name = "Command Bodysuit"

12
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -378,17 +378,17 @@
display_name = "Jumpsuit - Circuitry"
path = /obj/item/clothing/under/circuitry
/datum/gear/uniform/sifguard
/datum/gear/uniform/sysguard
display_name = "Uniform - Crew"
path = /obj/item/clothing/under/solgov/utility/sifguard/crew
path = /obj/item/clothing/under/oricon/utility/sysguard/crew
/datum/gear/uniform/marine/green
display_name = "Uniform - Green Fatigues"
path = /obj/item/clothing/under/solgov/utility/marine/green
path = /obj/item/clothing/under/oricon/utility/marine/green
/datum/gear/uniform/marine/tan
display_name = "Uniform - Tan Fatigues"
path = /obj/item/clothing/under/solgov/utility/marine/tan
path = /obj/item/clothing/under/oricon/utility/marine/tan
/datum/gear/uniform/sleekoverall
display_name = "Overalls - Sleek"
path = /obj/item/clothing/under/overalls/sleek
@@ -567,9 +567,9 @@ datum/gear/uniform/bodysuiteva
path = /obj/item/clothing/under/permit
/*
// Polaris overrides
/datum/gear/uniform/solgov/pt/sifguard
/datum/gear/uniform/solgov/pt/sysguard
display_name = "pt uniform, planetside sec"
path = /obj/item/clothing/under/solgov/pt/sifguard
path = /obj/item/clothing/under/solgov/pt/sysguard
*/

40
code/modules/clothing/head/helmet.dm
View File

@@ -17,19 +17,19 @@
drop_sound = 'sound/items/drop/helm.ogg'
pickup_sound = 'sound/items/pickup/helm.ogg'
/obj/item/clothing/head/helmet/solgov
name = "\improper Solar Confederate Government helmet"
/obj/item/clothing/head/helmet/oricon
name = "\improper Orion Confederation Government helmet"
desc = "A helmet painted in Peacekeeper blue. Stands out like a sore thumb."
icon_state = "helmet_sol"
armor = list(melee = 50, bullet = 50, laser = 50,energy = 25, bomb = 30, bio = 0, rad = 0)
valid_accessory_slots = null
/obj/item/clothing/head/helmet/solgov/command
/obj/item/clothing/head/helmet/oricon/command
name = "command helmet"
desc = "A helmet with 'Solar Confederate Government' printed on the back in gold lettering."
desc = "A helmet with 'Orion Confederation Government' printed on the back in gold lettering."
icon_state = "helmet_command"
/obj/item/clothing/head/helmet/solgov/security
/obj/item/clothing/head/helmet/oricon/security
name = "security helmet"
desc = "A helmet with 'MASTER AT ARMS' printed on the back in silver lettering."
icon_state = "helmet_security"
@@ -309,3 +309,33 @@
/obj/item/clothing/head/helmet/bike_helmet/random/Initialize(mapload)
. = ..()
color = rgb(rand(1,255),rand(1,255),rand(1,255))
/obj/item/clothing/head/helmet/oricon
name = "\improper Orion Confederation Government helmet"
desc = "A helmet painted in Peacekeeper blue. Stands out like a sore thumb."
/obj/item/clothing/head/helmet/oricon/command
name = "\improper Orion Central commander helmet"
desc = "A helmet with 'Orion Confederation Government' printed on the back in gold lettering."
/obj/item/clothing/head/helmet/combat/USDF
name = "marine helmet"
desc = "If you wanna to keep your brain inside yo' head, you'd best put this on!"
icon_state = "unsc_helm"
item_state = "unsc_helm"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
/obj/item/clothing/head/helmet/combat/imperial
name = "imperial soldier helmet"
desc = "Veni, vidi, vici; I came, I saw, I conquered."
icon_state = "ge_helm"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
/obj/item/clothing/head/helmet/combat/imperial/centurion
name = "imperial centurion helmet"
desc = "Vendi, vidi, visa; I came, I saw, I realised this hat was too expensive."
icon_state = "ge_helmcent"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'

29
code/modules/clothing/head/helmet_vr.dm
View File

@@ -1,29 +0,0 @@
/obj/item/clothing/head/helmet/solgov
name = "\improper Solar Central Government helmet"
desc = "A helmet painted in Peacekeeper blue. Stands out like a sore thumb."
/obj/item/clothing/head/helmet/solgov/command
name = "\improper Solar Central commander helmet"
desc = "A helmet with 'Solar Central Government' printed on the back in gold lettering."
/obj/item/clothing/head/helmet/combat/USDF
name = "marine helmet"
desc = "If you wanna to keep your brain inside yo' head, you'd best put this on!"
icon_state = "unsc_helm"
item_state = "unsc_helm"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
/obj/item/clothing/head/helmet/combat/imperial
name = "imperial soldier helmet"
desc = "Veni, vidi, vici; I came, I saw, I conquered."
icon_state = "ge_helm"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
/obj/item/clothing/head/helmet/combat/imperial/centurion
name = "imperial centurion helmet"
desc = "Vendi, vidi, visa; I came, I saw, I realised this hat was too expensive."
icon_state = "ge_helmcent"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'

2
code/modules/clothing/head/misc.dm
View File

@@ -7,7 +7,7 @@
/obj/item/clothing/head/centhat/customs
name = "Customs Hat"
desc = "A formal hat for SolGov Customs Officers."
desc = "A formal hat for OriCon Customs Officers."
icon_state = "customshat"
/obj/item/clothing/head/pin

409
code/modules/clothing/head/oricon.dm Normal file
View File

@@ -0,0 +1,409 @@
//SolGov uniform hats
//Utility
/obj/item/clothing/head/soft/orion
name = "\improper SolGov cap"
desc = "It's a blue ballcap in Orion Confederation Government colors."
icon_state = "orionsoft"
item_state_slots = list(
slot_l_hand_str = "lightbluesoft",
slot_r_hand_str = "lightbluesoft",
)
/obj/item/clothing/head/soft/orion/expedition
name = "\improper SifGuard cap"
desc = "It's a black ballcap bearing a Sif Defense Force crest."
icon_state = "expeditionsoft"
item_state_slots = list(
slot_l_hand_str = "blacksoft",
slot_r_hand_str = "blacksoft",
)
/obj/item/clothing/head/soft/orion/fleet
name = "fleet cap"
desc = "It's a navy blue ballcap with a OCG Fleet crest."
icon_state = "fleetsoft"
item_state_slots = list(
slot_l_hand_str = "darkbluesoft",
slot_r_hand_str = "darkbluesoft",
)
/obj/item/clothing/head/utility
name = "utility cover"
desc = "An eight-point utility cover."
icon_state = "greyutility"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
)
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/utility/fleet
name = "fleet utility cover"
desc = "A navy blue utility cover bearing the crest of a OCG Fleet."
icon_state = "navyutility"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
/obj/item/clothing/head/utility/marine
name = "marine utility cover"
desc = "A grey utility cover bearing the crest of the OCG Marine Corps."
icon_state = "greyutility"
armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/head/utility/marine/tan
name = "tan utility cover"
desc = "A tan utility cover bearing the crest of the OCG Marine Corps."
icon_state = "tanutility"
/obj/item/clothing/head/utility/marine/green
name = "green utility cover"
desc = "A green utility cover bearing the crest of the OCG Marine Corps."
icon_state = "greenutility"
//Service
/obj/item/clothing/head/service
name = "service cover"
desc = "A service uniform cover."
icon_state = "greenwheelcap"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
)
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/service/marine
name = "marine wheel cover"
desc = "A green service uniform cover with an OCG Marine Corps crest."
icon_state = "greenwheelcap"
/obj/item/clothing/head/service/marine/command
name = "marine officer's wheel cover"
desc = "A green service uniform cover with an OCG Marine Corps crest and gold stripe."
icon_state = "greenwheelcap_com"
/obj/item/clothing/head/service/marine/garrison
name = "marine garrison cap"
desc = "A green garrison cap belonging to the OCG Marine Corps."
icon_state = "greengarrisoncap"
/obj/item/clothing/head/service/marine/garrison/command
name = "marine officer's garrison cap"
desc = "A green garrison cap belonging to the OCG Marine Corps. This one has a gold pin."
icon_state = "greengarrisoncap_com"
/obj/item/clothing/head/service/marine/campaign
name = "campaign cover"
desc = "A green campaign cover with an OCG Marine Corps crest. Only found on the heads of Drill Instructors."
icon_state = "greendrill"
//Dress
/obj/item/clothing/head/dress
name = "dress cover"
desc = "A dress uniform cover."
icon_state = "greenwheelcap"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
)
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/dress/expedition
name = "\improper SifGuard dress cap"
desc = "A peaked grey dress uniform cap belonging to the Sif Defense Force."
icon_state = "greydresscap"
/obj/item/clothing/head/dress/expedition/command
name = "\improper SifGuard command dress cap"
desc = "A peaked grey dress uniform cap belonging to the Sif Defense Force. This one is trimmed in gold."
icon_state = "greydresscap_com"
/obj/item/clothing/head/dress/fleet
name = "fleet dress wheel cover"
desc = "A white dress uniform cover. This one has an OCG Fleet crest."
icon_state = "whitepeakcap"
/obj/item/clothing/head/dress/fleet/command
name = "fleet command dress wheel cover"
desc = "A white dress uniform cover. This one has a gold stripe and an OCG Fleet crest."
icon_state = "whitepeakcap_com"
/obj/item/clothing/head/dress/marine
name = "marine dress wheel cover"
desc = "A white dress uniform cover with an OCG Marine Corps crest."
icon_state = "whitewheelcap"
/obj/item/clothing/head/dress/marine/command
name = "marine officer's dress wheel cover"
desc = "A white dress uniform cover with an OCG Marine Corps crest and gold stripe."
icon_state = "whitewheelcap_com"
//Berets
/obj/item/clothing/head/beret/orion
name = "peacekeeper beret"
desc = "A beret in Orion Confederation Government colors. For peacekeepers that are more inclined towards style than safety."
icon_state = "beret_lightblue"
/obj/item/clothing/head/beret/orion/gateway
name = "gateway administration beret"
desc = "An orange beret denoting service in the Gateway Administration. For personnel that are more inclined towards style than safety."
icon_state = "beret_orange"
/obj/item/clothing/head/beret/orion/customs
name = "customs and trade beret"
desc = "A purple beret denoting service in the Customs and Trade Bureau. For personnel that are more inclined towards style than safety."
icon_state = "beret_purpleyellow"
/obj/item/clothing/head/beret/orion/orbital
name = "orbital assault beret"
desc = "A blue beret denoting orbital assault training. For helljumpers that are more inclined towards style than safety."
icon_state = "beret_blue"
/obj/item/clothing/head/beret/orion/research
name = "government research beret"
desc = "A green beret denoting service in the Bureau of Research. For explorers that are more inclined towards style than safety."
icon_state = "beret_green"
/obj/item/clothing/head/beret/orion/health
name = "health service beret"
desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety."
icon_state = "beret_white"
/obj/item/clothing/head/beret/orion/expedition
name = "\improper SifGuard beret"
desc = "A black beret belonging to the Sif Defense Force. For personnel that are more inclined towards style than safety."
icon_state = "beret_black"
/obj/item/clothing/head/beret/orion/expedition/security
name = "\improper SifGuard security beret"
desc = "A Sif Defense Force beret with a security crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_security"
/obj/item/clothing/head/beret/orion/expedition/medical
name = "\improper SifGuard medical beret"
desc = "A Sif Defense Force beret with a medical crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_medical"
/obj/item/clothing/head/beret/orion/expedition/engineering
name = "\improper SifGuard engineering beret"
desc = "A Sif Defense Force beret with an engineering crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_engineering"
/obj/item/clothing/head/beret/orion/expedition/supply
name = "\improper SifGuard supply beret"
desc = "A Sif Defense Force beret with a supply crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_supply"
/obj/item/clothing/head/beret/orion/expedition/command
name = "\improper SifGuard command beret"
desc = "A Sif Defense Force beret with a command crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_command"
/obj/item/clothing/head/beret/orion/fleet
name = "fleet beret"
desc = "A navy blue beret belonging to the OCG Fleet. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy"
/obj/item/clothing/head/beret/orion/fleet/security
name = "fleet security beret"
desc = "An OCG Fleet beret with a security crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_security"
/obj/item/clothing/head/beret/orion/fleet/medical
name = "fleet medical beret"
desc = "An OCG Fleet beret with a medical crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_medical"
/obj/item/clothing/head/beret/orion/fleet/engineering
name = "fleet engineering beret"
desc = "An OCG Fleet with an engineering crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_engineering"
/obj/item/clothing/head/beret/orion/fleet/supply
name = "fleet supply beret"
desc = "An OCG Fleet beret with a supply crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_supply"
/obj/item/clothing/head/beret/orion/fleet/command
name = "fleet command beret"
desc = "An OCG Fleet beret with a command crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_command"
//OriCon uniform hats
//Utility
/obj/item/clothing/head/soft/orion
name = "\improper OriCon cap"
desc = "It's a blue ballcap in Orion Confederation Government colors."
/obj/item/clothing/head/soft/orion/expedition
name = "explorer's cap"
desc = "It's a black ballcap bearing a Society of Universal Cartographers crest."
/obj/item/clothing/head/soft/orion/fleet
name = "fleet cap"
desc = "It's a navy blue ballcap with a USDF Fleet crest."
/obj/item/clothing/head/utility
name = "utility cover"
desc = "An eight-point utility cover."
/obj/item/clothing/head/utility/fleet
name = "fleet utility cover"
desc = "A navy blue utility cover bearing the crest of a USDF Fleet."
/obj/item/clothing/head/utility/marine
name = "marine utility cover"
desc = "A grey utility cover bearing the crest of the USDF Marine Corps."
/obj/item/clothing/head/utility/marine/tan
name = "tan utility cover"
desc = "A tan utility cover bearing the crest of the USDF Marine Corps."
/obj/item/clothing/head/utility/marine/green
name = "green utility cover"
desc = "A green utility cover bearing the crest of the USDF Marine Corps."
/obj/item/clothing/head/utility/marine/green/officer // "And YOU told me you were gonna wear something nice!"
name = "\improper officer's cap"
desc = "A green utility cover bearing the crest of the USDF Marine Corps. This one has an officer's emblem."
icon_state = "UNSCsoft"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
//Service
/obj/item/clothing/head/service
name = "service cover"
desc = "A service uniform cover."
/obj/item/clothing/head/service/marine
name = "marine wheel cover"
desc = "A green service uniform cover with an USDF Marine Corps crest."
/obj/item/clothing/head/service/marine/command
name = "marine officer's wheel cover"
desc = "A green service uniform cover with an USDF Marine Corps crest and gold stripe."
/obj/item/clothing/head/service/marine/garrison
name = "marine garrison cap"
desc = "A green garrison cap belonging to the USDF Marine Corps."
/obj/item/clothing/head/service/marine/garrison/command
name = "marine officer's garrison cap"
desc = "A green garrison cap belonging to the USDF Marine Corps. This one has a gold pin."
/obj/item/clothing/head/service/marine/campaign
name = "campaign cover"
desc = "A green campaign cover with an USDF Marine Corps crest. Only found on the heads of Drill Instructors."
icon_state = "greendrill"
//Dress
/obj/item/clothing/head/dress/expedition
name = "explorer's dress cap"
desc = "A peaked grey dress uniform cap belonging to the Society of Universal Cartographers."
/obj/item/clothing/head/dress/expedition/command
name = "explorer's command dress cap"
desc = "A peaked grey dress uniform cap belonging to the Society of Universal Cartographers. This one is trimmed in gold."
/obj/item/clothing/head/dress/fleet
name = "fleet dress wheel cover"
desc = "A white dress uniform cover. This one has an USDF Fleet crest."
/obj/item/clothing/head/dress/fleet/command
name = "fleet command dress wheel cover"
desc = "A white dress uniform cover. This one has a gold stripe and an USDF Fleet crest."
/obj/item/clothing/head/dress/marine
name = "marine dress wheel cover"
desc = "A white dress uniform cover with an USDF Marine Corps crest."
/obj/item/clothing/head/dress/marine/command
name = "marine officer's dress wheel cover"
desc = "A white dress uniform cover with an USDF Marine Corps crest and gold stripe."
/obj/item/clothing/head/dress/marine/command/admiral
name = "admiral's dress wheel cover"
desc = "A white dress uniform cover with an USDF Navy crest and gold stripe."
//Berets
/obj/item/clothing/head/beret/orion
name = "peacekeeper beret"
desc = "A beret in Orion Confederation Government colors. For peacekeepers that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/gateway
name = "gateway administration beret"
desc = "An orange beret denoting service in the Gateway Administration. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/customs
name = "customs and trade beret"
desc = "A purple beret denoting service in the Customs and Trade Bureau. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/orbital
name = "orbital assault beret"
desc = "A blue beret denoting orbital assault training. For helljumpers that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/research
name = "government research beret"
desc = "A green beret denoting service in the Bureau of Research. For explorers that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/health
name = "health service beret"
desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/expedition
name = "explorer's beret"
desc = "A black beret belonging to the Society of Universal Cartographers. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/expedition/security
name = "explorer's security beret"
desc = "A Society of Universal Cartographers beret with a security crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/expedition/medical
name = "explorer's medical beret"
desc = "A Society of Universal Cartographers beret with a medical crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/expedition/engineering
name = "explorer's engineering beret"
desc = "A Society of Universal Cartographers beret with an engineering crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/expedition/supply
name = "explorer's supply beret"
desc = "A Society of Universal Cartographers beret with a supply crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/expedition/command
name = "explorer's command beret"
desc = "A Society of Universal Cartographers beret with a command crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/fleet
name = "fleet beret"
desc = "A navy blue beret belonging to the USDF Fleet. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/fleet/security
name = "fleet security beret"
desc = "An USDF Fleet beret with a security crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/fleet/medical
name = "fleet medical beret"
desc = "An USDF Fleet beret with a medical crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/fleet/engineering
name = "fleet engineering beret"
desc = "An USDF Fleet with an engineering crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/fleet/supply
name = "fleet supply beret"
desc = "An USDF Fleet beret with a supply crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/orion/fleet/command
name = "fleet command beret"
desc = "An USDF Fleet beret with a command crest. For personnel that are more inclined towards style than safety."

236
code/modules/clothing/head/solgov.dm
View File

@@ -1,236 +0,0 @@
//SolGov uniform hats
//Utility
/obj/item/clothing/head/soft/sol
name = "\improper SolGov cap"
desc = "It's a blue ballcap in Solar Confederate Government colors."
icon_state = "solsoft"
item_state_slots = list(
slot_l_hand_str = "lightbluesoft",
slot_r_hand_str = "lightbluesoft",
)
/obj/item/clothing/head/soft/sol/expedition
name = "\improper SifGuard cap"
desc = "It's a black ballcap bearing a Sif Defense Force crest."
icon_state = "expeditionsoft"
item_state_slots = list(
slot_l_hand_str = "blacksoft",
slot_r_hand_str = "blacksoft",
)
/obj/item/clothing/head/soft/sol/fleet
name = "fleet cap"
desc = "It's a navy blue ballcap with a SCG Fleet crest."
icon_state = "fleetsoft"
item_state_slots = list(
slot_l_hand_str = "darkbluesoft",
slot_r_hand_str = "darkbluesoft",
)
/obj/item/clothing/head/utility
name = "utility cover"
desc = "An eight-point utility cover."
icon_state = "greyutility"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
)
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/utility/fleet
name = "fleet utility cover"
desc = "A navy blue utility cover bearing the crest of a SCG Fleet."
icon_state = "navyutility"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
/obj/item/clothing/head/utility/marine
name = "marine utility cover"
desc = "A grey utility cover bearing the crest of the SCG Marine Corps."
icon_state = "greyutility"
armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/head/utility/marine/tan
name = "tan utility cover"
desc = "A tan utility cover bearing the crest of the SCG Marine Corps."
icon_state = "tanutility"
/obj/item/clothing/head/utility/marine/green
name = "green utility cover"
desc = "A green utility cover bearing the crest of the SCG Marine Corps."
icon_state = "greenutility"
//Service
/obj/item/clothing/head/service
name = "service cover"
desc = "A service uniform cover."
icon_state = "greenwheelcap"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
)
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/service/marine
name = "marine wheel cover"
desc = "A green service uniform cover with an SCG Marine Corps crest."
icon_state = "greenwheelcap"
/obj/item/clothing/head/service/marine/command
name = "marine officer's wheel cover"
desc = "A green service uniform cover with an SCG Marine Corps crest and gold stripe."
icon_state = "greenwheelcap_com"
/obj/item/clothing/head/service/marine/garrison
name = "marine garrison cap"
desc = "A green garrison cap belonging to the SCG Marine Corps."
icon_state = "greengarrisoncap"
/obj/item/clothing/head/service/marine/garrison/command
name = "marine officer's garrison cap"
desc = "A green garrison cap belonging to the SCG Marine Corps. This one has a gold pin."
icon_state = "greengarrisoncap_com"
/obj/item/clothing/head/service/marine/campaign
name = "campaign cover"
desc = "A green campaign cover with an SCG Marine Corps crest. Only found on the heads of Drill Instructors."
icon_state = "greendrill"
//Dress
/obj/item/clothing/head/dress
name = "dress cover"
desc = "A dress uniform cover."
icon_state = "greenwheelcap"
item_state_slots = list(
slot_l_hand_str = "helmet",
slot_r_hand_str = "helmet",
)
siemens_coefficient = 0.9
body_parts_covered = 0
/obj/item/clothing/head/dress/expedition
name = "\improper SifGuard dress cap"
desc = "A peaked grey dress uniform cap belonging to the Sif Defense Force."
icon_state = "greydresscap"
/obj/item/clothing/head/dress/expedition/command
name = "\improper SifGuard command dress cap"
desc = "A peaked grey dress uniform cap belonging to the Sif Defense Force. This one is trimmed in gold."
icon_state = "greydresscap_com"
/obj/item/clothing/head/dress/fleet
name = "fleet dress wheel cover"
desc = "A white dress uniform cover. This one has an SCG Fleet crest."
icon_state = "whitepeakcap"
/obj/item/clothing/head/dress/fleet/command
name = "fleet command dress wheel cover"
desc = "A white dress uniform cover. This one has a gold stripe and an SCG Fleet crest."
icon_state = "whitepeakcap_com"
/obj/item/clothing/head/dress/marine
name = "marine dress wheel cover"
desc = "A white dress uniform cover with an SCG Marine Corps crest."
icon_state = "whitewheelcap"
/obj/item/clothing/head/dress/marine/command
name = "marine officer's dress wheel cover"
desc = "A white dress uniform cover with an SCG Marine Corps crest and gold stripe."
icon_state = "whitewheelcap_com"
//Berets
/obj/item/clothing/head/beret/sol
name = "peacekeeper beret"
desc = "A beret in Solar Confederate Government colors. For peacekeepers that are more inclined towards style than safety."
icon_state = "beret_lightblue"
/obj/item/clothing/head/beret/sol/gateway
name = "gateway administration beret"
desc = "An orange beret denoting service in the Gateway Administration. For personnel that are more inclined towards style than safety."
icon_state = "beret_orange"
/obj/item/clothing/head/beret/sol/customs
name = "customs and trade beret"
desc = "A purple beret denoting service in the Customs and Trade Bureau. For personnel that are more inclined towards style than safety."
icon_state = "beret_purpleyellow"
/obj/item/clothing/head/beret/sol/orbital
name = "orbital assault beret"
desc = "A blue beret denoting orbital assault training. For helljumpers that are more inclined towards style than safety."
icon_state = "beret_blue"
/obj/item/clothing/head/beret/sol/research
name = "government research beret"
desc = "A green beret denoting service in the Bureau of Research. For explorers that are more inclined towards style than safety."
icon_state = "beret_green"
/obj/item/clothing/head/beret/sol/health
name = "health service beret"
desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety."
icon_state = "beret_white"
/obj/item/clothing/head/beret/sol/expedition
name = "\improper SifGuard beret"
desc = "A black beret belonging to the Sif Defense Force. For personnel that are more inclined towards style than safety."
icon_state = "beret_black"
/obj/item/clothing/head/beret/sol/expedition/security
name = "\improper SifGuard security beret"
desc = "A Sif Defense Force beret with a security crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_security"
/obj/item/clothing/head/beret/sol/expedition/medical
name = "\improper SifGuard medical beret"
desc = "A Sif Defense Force beret with a medical crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_medical"
/obj/item/clothing/head/beret/sol/expedition/engineering
name = "\improper SifGuard engineering beret"
desc = "A Sif Defense Force beret with an engineering crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_engineering"
/obj/item/clothing/head/beret/sol/expedition/supply
name = "\improper SifGuard supply beret"
desc = "A Sif Defense Force beret with a supply crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_supply"
/obj/item/clothing/head/beret/sol/expedition/command
name = "\improper SifGuard command beret"
desc = "A Sif Defense Force beret with a command crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_black_command"
/obj/item/clothing/head/beret/sol/fleet
name = "fleet beret"
desc = "A navy blue beret belonging to the SCG Fleet. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy"
/obj/item/clothing/head/beret/sol/fleet/security
name = "fleet security beret"
desc = "An SCG Fleet beret with a security crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_security"
/obj/item/clothing/head/beret/sol/fleet/medical
name = "fleet medical beret"
desc = "An SCG Fleet beret with a medical crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_medical"
/obj/item/clothing/head/beret/sol/fleet/engineering
name = "fleet engineering beret"
desc = "An SCG Fleet with an engineering crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_engineering"
/obj/item/clothing/head/beret/sol/fleet/supply
name = "fleet supply beret"
desc = "An SCG Fleet beret with a supply crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_supply"
/obj/item/clothing/head/beret/sol/fleet/command
name = "fleet command beret"
desc = "An SCG Fleet beret with a command crest. For personnel that are more inclined towards style than safety."
icon_state = "beret_navy_command"

172
code/modules/clothing/head/solgov_vr.dm
View File

@@ -1,172 +0,0 @@
//SolGov uniform hats
//Utility
/obj/item/clothing/head/soft/sol
name = "\improper SolGov cap"
desc = "It's a blue ballcap in Solar Central Government colors."
/obj/item/clothing/head/soft/sol/expedition
name = "explorer's cap"
desc = "It's a black ballcap bearing a Society of Universal Cartographers crest."
/obj/item/clothing/head/soft/sol/fleet
name = "fleet cap"
desc = "It's a navy blue ballcap with a USDF Fleet crest."
/obj/item/clothing/head/utility
name = "utility cover"
desc = "An eight-point utility cover."
/obj/item/clothing/head/utility/fleet
name = "fleet utility cover"
desc = "A navy blue utility cover bearing the crest of a USDF Fleet."
/obj/item/clothing/head/utility/marine
name = "marine utility cover"
desc = "A grey utility cover bearing the crest of the USDF Marine Corps."
/obj/item/clothing/head/utility/marine/tan
name = "tan utility cover"
desc = "A tan utility cover bearing the crest of the USDF Marine Corps."
/obj/item/clothing/head/utility/marine/green
name = "green utility cover"
desc = "A green utility cover bearing the crest of the USDF Marine Corps."
/obj/item/clothing/head/utility/marine/green/officer // "And YOU told me you were gonna wear something nice!"
name = "\improper officer's cap"
desc = "A green utility cover bearing the crest of the USDF Marine Corps. This one has an officer's emblem."
icon_state = "UNSCsoft"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
//Service
/obj/item/clothing/head/service
name = "service cover"
desc = "A service uniform cover."
/obj/item/clothing/head/service/marine
name = "marine wheel cover"
desc = "A green service uniform cover with an USDF Marine Corps crest."
/obj/item/clothing/head/service/marine/command
name = "marine officer's wheel cover"
desc = "A green service uniform cover with an USDF Marine Corps crest and gold stripe."
/obj/item/clothing/head/service/marine/garrison
name = "marine garrison cap"
desc = "A green garrison cap belonging to the USDF Marine Corps."
/obj/item/clothing/head/service/marine/garrison/command
name = "marine officer's garrison cap"
desc = "A green garrison cap belonging to the USDF Marine Corps. This one has a gold pin."
/obj/item/clothing/head/service/marine/campaign
name = "campaign cover"
desc = "A green campaign cover with an USDF Marine Corps crest. Only found on the heads of Drill Instructors."
icon_state = "greendrill"
//Dress
/obj/item/clothing/head/dress/expedition
name = "explorer's dress cap"
desc = "A peaked grey dress uniform cap belonging to the Society of Universal Cartographers."
/obj/item/clothing/head/dress/expedition/command
name = "explorer's command dress cap"
desc = "A peaked grey dress uniform cap belonging to the Society of Universal Cartographers. This one is trimmed in gold."
/obj/item/clothing/head/dress/fleet
name = "fleet dress wheel cover"
desc = "A white dress uniform cover. This one has an USDF Fleet crest."
/obj/item/clothing/head/dress/fleet/command
name = "fleet command dress wheel cover"
desc = "A white dress uniform cover. This one has a gold stripe and an USDF Fleet crest."
/obj/item/clothing/head/dress/marine
name = "marine dress wheel cover"
desc = "A white dress uniform cover with an USDF Marine Corps crest."
/obj/item/clothing/head/dress/marine/command
name = "marine officer's dress wheel cover"
desc = "A white dress uniform cover with an USDF Marine Corps crest and gold stripe."
/obj/item/clothing/head/dress/marine/command/admiral
name = "admiral's dress wheel cover"
desc = "A white dress uniform cover with an USDF Navy crest and gold stripe."
//Berets
/obj/item/clothing/head/beret/sol
name = "peacekeeper beret"
desc = "A beret in Solar Central Government colors. For peacekeepers that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/gateway
name = "gateway administration beret"
desc = "An orange beret denoting service in the Gateway Administration. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/customs
name = "customs and trade beret"
desc = "A purple beret denoting service in the Customs and Trade Bureau. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/orbital
name = "orbital assault beret"
desc = "A blue beret denoting orbital assault training. For helljumpers that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/research
name = "government research beret"
desc = "A green beret denoting service in the Bureau of Research. For explorers that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/health
name = "health service beret"
desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition
name = "explorer's beret"
desc = "A black beret belonging to the Society of Universal Cartographers. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/security
name = "explorer's security beret"
desc = "A Society of Universal Cartographers beret with a security crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/medical
name = "explorer's medical beret"
desc = "A Society of Universal Cartographers beret with a medical crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/engineering
name = "explorer's engineering beret"
desc = "A Society of Universal Cartographers beret with an engineering crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/supply
name = "explorer's supply beret"
desc = "A Society of Universal Cartographers beret with a supply crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/expedition/command
name = "explorer's command beret"
desc = "A Society of Universal Cartographers beret with a command crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet
name = "fleet beret"
desc = "A navy blue beret belonging to the USDF Fleet. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/security
name = "fleet security beret"
desc = "An USDF Fleet beret with a security crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/medical
name = "fleet medical beret"
desc = "An USDF Fleet beret with a medical crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/engineering
name = "fleet engineering beret"
desc = "An USDF Fleet with an engineering crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/supply
name = "fleet supply beret"
desc = "An USDF Fleet beret with a supply crest. For personnel that are more inclined towards style than safety."
/obj/item/clothing/head/beret/sol/fleet/command
name = "fleet command beret"
desc = "An USDF Fleet beret with a command crest. For personnel that are more inclined towards style than safety."

80
code/modules/clothing/suits/armor.dm
View File

@@ -661,3 +661,83 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO
armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
action_button_name = "Enable Coat Sigils"
/obj/item/clothing/suit/armor/heavy
name = "heavy armor"
desc = "An old military-grade suit of armor. Incredibly robust against brute force damage! However, it offers little protection from energy-based weapons, which, combined with its bulk, makes it woefully obsolete."
icon_state = "heavy"
item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
armor = list(melee = 90, bullet = 80, laser = 10, energy = 10, bomb = 80, bio = 0, rad = 0)
w_class = ITEMSIZE_HUGE // massively bulky item
gas_transfer_coefficient = 0.90
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 5 // If you're a tank you're gonna move like a tank.
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 0
/obj/item/clothing/suit/armor/vest/wolftaur
name = "wolf-taur armor vest"
desc = "An armored vest that protects against some damage. It appears to be created for a wolf-taur."
species_restricted = null //Species restricted since all it cares about is a taur half
icon = 'icons/mob/taursuits_wolf_vr.dmi'
icon_state = "heavy_wolf_armor"
item_state = "heavy_wolf_armor"
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
return ..()
else
to_chat(H,"<span class='warning'>You need to have a wolf-taur half to wear this.</span>")
return 0
// HoS armor improved by Vorestation to be slightly better than normal security stuff.
/obj/item/clothing/suit/storage/vest/hoscoat
armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/vest/hos
armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/vest/hoscoat/jensen
name = "armored trenchcoat"
desc = "A trenchcoat augmented with a special alloy for some protection and style."
icon_state = "hostrench"
flags_inv = HIDEHOLSTER
// Override Polaris's "confederate" naming convention. I hate it.
/obj/item/clothing/suit/storage/vest/oricon
name = "\improper Orion Confederation Government armored vest"
desc = "A synthetic armor vest. This one is marked with the crest of the Orion Confederation Group."
/obj/item/clothing/suit/storage/vest/oricon/heavy
name = "\improper Orion Confederation Government heavy armored vest"
desc = "A synthetic armor vest with SECURITY printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates." // USDF does peacekeeping, not these guys.
/obj/item/clothing/suit/storage/vest/oricon/security
name = "master at arms heavy armored vest"
desc = "A synthetic armor vest with MASTER AT ARMS printed in silver lettering on the chest. This one has added webbing and ballistic plates."
/obj/item/clothing/suit/storage/vest/oricon/command
name = "command heavy armored vest"
desc = "A synthetic armor vest with Orion Confederation Government printed in detailed gold lettering on the chest. This one has added webbing and ballistic plates."
/obj/item/clothing/suit/armor/combat/USDF
name = "marine body armor"
desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon<6F>and we had to <i>share</i> the rock!"
icon_state = "unsc_armor"
icon = 'icons/obj/clothing/suits_vr.dmi'
icon_override = 'icons/mob/suit_vr.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO // ToDo: Break up the armor into smaller bits.
/obj/item/clothing/suit/armor/combat/imperial
name = "imperial soldier armor"
desc = "Made out of an especially light metal, it lets you conquer in style."
icon_state = "ge_armor"
icon = 'icons/obj/clothing/suits_vr.dmi'
icon_override = 'icons/mob/suit_vr.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/suit/armor/combat/imperial/centurion
name = "imperial centurion armor"
desc = "Not all heroes wear capes, but it'd be cooler if they did."
icon_state = "ge_armorcent"

79
code/modules/clothing/suits/armor_vr.dm
View File

@@ -1,79 +0,0 @@
/obj/item/clothing/suit/armor/heavy
name = "heavy armor"
desc = "An old military-grade suit of armor. Incredibly robust against brute force damage! However, it offers little protection from energy-based weapons, which, combined with its bulk, makes it woefully obsolete."
icon_state = "heavy"
item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
armor = list(melee = 90, bullet = 80, laser = 10, energy = 10, bomb = 80, bio = 0, rad = 0)
w_class = ITEMSIZE_HUGE // massively bulky item
gas_transfer_coefficient = 0.90
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 5 // If you're a tank you're gonna move like a tank.
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
siemens_coefficient = 0
/obj/item/clothing/suit/armor/vest/wolftaur
name = "wolf-taur armor vest"
desc = "An armored vest that protects against some damage. It appears to be created for a wolf-taur."
species_restricted = null //Species restricted since all it cares about is a taur half
icon = 'icons/mob/taursuits_wolf_vr.dmi'
icon_state = "heavy_wolf_armor"
item_state = "heavy_wolf_armor"
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
return ..()
else
to_chat(H,"<span class='warning'>You need to have a wolf-taur half to wear this.</span>")
return 0
// HoS armor improved by Vorestation to be slightly better than normal security stuff.
/obj/item/clothing/suit/storage/vest/hoscoat
armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/vest/hos
armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/vest/hoscoat/jensen
name = "armored trenchcoat"
desc = "A trenchcoat augmented with a special alloy for some protection and style."
icon_state = "hostrench"
flags_inv = HIDEHOLSTER
// Override Polaris's "confederate" naming convention. I hate it.
/obj/item/clothing/suit/storage/vest/solgov
name = "\improper Solar Central Government armored vest"
desc = "A synthetic armor vest. This one is marked with the crest of the Solar Central Government."
/obj/item/clothing/suit/storage/vest/solgov/heavy
name = "\improper Solar Central Government heavy armored vest"
desc = "A synthetic armor vest with SECURITY printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates." // USDF does peacekeeping, not these guys.
/obj/item/clothing/suit/storage/vest/solgov/security
name = "master at arms heavy armored vest"
desc = "A synthetic armor vest with MASTER AT ARMS printed in silver lettering on the chest. This one has added webbing and ballistic plates."
/obj/item/clothing/suit/storage/vest/solgov/command
name = "command heavy armored vest"
desc = "A synthetic armor vest with Solar Central Government printed in detailed gold lettering on the chest. This one has added webbing and ballistic plates."
/obj/item/clothing/suit/armor/combat/USDF
name = "marine body armor"
desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon<6F>and we had to <i>share</i> the rock!"
icon_state = "unsc_armor"
icon = 'icons/obj/clothing/suits_vr.dmi'
icon_override = 'icons/mob/suit_vr.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO // ToDo: Break up the armor into smaller bits.
/obj/item/clothing/suit/armor/combat/imperial
name = "imperial soldier armor"
desc = "Made out of an especially light metal, it lets you conquer in style."
icon_state = "ge_armor"
icon = 'icons/obj/clothing/suits_vr.dmi'
icon_override = 'icons/mob/suit_vr.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/suit/armor/combat/imperial/centurion
name = "imperial centurion armor"
desc = "Not all heroes wear capes, but it'd be cooler if they did."
icon_state = "ge_armorcent"

2
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -337,7 +337,7 @@ obj/item/clothing/suit/kamishimo
/obj/item/clothing/suit/customs
name = "customs jacket"
desc = "A standard SolGov Customs formal jacket."
desc = "A standard OriCon Customs formal jacket."
icon_state = "customs_jacket"
item_state_slots = list(slot_r_hand_str = "suit_blue", slot_l_hand_str = "suit_blue")
flags_inv = HIDEHOLSTER

275
code/modules/clothing/suits/oricon.dm Normal file
View File

@@ -0,0 +1,275 @@
//OriCon Uniform Suits
//Service
/obj/item/clothing/suit/storage/service
name = "service jacket"
desc = "A uniform service jacket, plain and undecorated."
icon_state = "blackservice"
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
flags_inv = HIDEHOLSTER //VOREStation Add - These obviously do.
allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/flashlight,/obj/item/pen,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/analyzer,/obj/item/radio,/obj/item/barrier_tape_roll)
/obj/item/clothing/suit/storage/service/sysguard
name = "\improper SysGuard jacket"
desc = "A uniform service jacket belonging to the System Defense Force. It has silver buttons."
icon_state = "blackservice_crew"
/obj/item/clothing/suit/storage/service/sysguard/medical
name = "\improper SysGuard medical jacket"
desc = "A uniform service jacket belonging to the System Defense Force. It has silver buttons and blue trim."
icon_state = "blackservice_med"
/obj/item/clothing/suit/storage/service/sysguard/medical/command
name = "\improper SysGuard medical command jacket"
desc = "A uniform service jacket belonging to the System Defense Force. It has gold buttons and blue trim."
icon_state = "blackservice_medcom"
/obj/item/clothing/suit/storage/service/sysguard/engineering
name = "\improper SysGuard engineering jacket"
desc = "A uniform service jacket belonging to the System Defense Force. It has silver buttons and orange trim."
icon_state = "blackservice_eng"
/obj/item/clothing/suit/storage/service/sysguard/engineering/command
name = "\improper SysGuard engineering command jacket"
desc = "A uniform service jacket belonging to the System Defense Force. It has gold buttons and orange trim."
icon_state = "blackservice_engcom"
/obj/item/clothing/suit/storage/service/sysguard/supply
name = "\improper SysGuard supply jacket"
desc = "A uniform service jacket belonging to the System Defense Force. It has silver buttons and brown trim."
icon_state = "blackservice_sup"
/obj/item/clothing/suit/storage/service/sysguard/security
name = "\improper SysGuard security jacket"
desc = "A uniform service jacket belonging to the System Defense Force. It has silver buttons and red trim."
icon_state = "blackservice_sec"
/obj/item/clothing/suit/storage/service/sysguard/security/command
name = "\improper SysGuard security command jacket"
desc = "A uniform service jacket belonging to the System Defense Force. It has gold buttons and red trim."
icon_state = "blackservice_seccom"
/obj/item/clothing/suit/storage/service/sysguard/command
name = "\improper SysGuard command jacket"
desc = "A uniform service jacket belonging to the System Defense Force. It has gold buttons and gold trim."
icon_state = "blackservice_com"
/obj/item/clothing/suit/storage/service/marine
name = "marine coat"
desc = "An OCG Marine Corps service coat. Green and undecorated."
icon_state = "greenservice"
item_state_slots = list(slot_r_hand_str = "suit_olive", slot_l_hand_str = "suit_olive")
/obj/item/clothing/suit/storage/service/marine/medical
name = "marine medical jacket"
desc = "An OCG Marine Corps service coat. This one has blue markings."
icon_state = "greenservice_med"
/obj/item/clothing/suit/storage/service/marine/medical/command
name = "marine medical command jacket"
desc = "An OCG Marine Corps service coat. This one has blue and gold markings."
icon_state = "greenservice_medcom"
/obj/item/clothing/suit/storage/service/marine/engineering
name = "marine engineering jacket"
desc = "An OCG Marine Corps service coat. This one has orange markings."
icon_state = "greenservice_eng"
/obj/item/clothing/suit/storage/service/marine/engineering/command
name = "marine engineering command jacket"
desc = "An OCG Marine Corps service coat. This one has orange and gold markings."
icon_state = "greenservice_engcom"
/obj/item/clothing/suit/storage/service/marine/supply
name = "marine supply jacket"
desc = "An OCG Marine Corps service coat. This one has brown markings."
icon_state = "greenservice_sup"
/obj/item/clothing/suit/storage/service/marine/security
name = "marine security jacket"
desc = "An OCG Marine Corps service coat. This one has red markings."
icon_state = "greenservice_sec"
/obj/item/clothing/suit/storage/service/marine/security/command
name = "marine security command jacket"
desc = "An OCG Marine Corps service coat. This one has red and gold markings."
icon_state = "greenservice_seccom"
/obj/item/clothing/suit/storage/service/marine/command
name = "marine command jacket"
desc = "An OCG Marine Corps service coat. This one has gold markings."
icon_state = "greenservice_com"
//Dress
/obj/item/clothing/suit/dress
name = "dress jacket"
desc = "A uniform dress jacket, fancy."
icon_state = "greydress"
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/radio,/obj/item/pen)
/obj/item/clothing/suit/dress/expedition
name = "SysGuard dress jacket"
desc = "A silver and grey dress jacket belonging to the System Defense Force. Fashionable, for the 25th century at least."
icon_state = "greydress"
/obj/item/clothing/suit/dress/expedition/command
name = "SysGuard command dress jacket"
desc = "A gold and grey dress jacket belonging to the System Defense Force. The height of fashion."
icon_state = "greydress_com"
/obj/item/clothing/suit/storage/toggle/dress
name = "clasped dress jacket"
desc = "A uniform dress jacket with gold toggles."
icon_state = "whitedress"
item_state = "labcoat"
blood_overlay_type = "coat"
/obj/item/clothing/suit/storage/toggle/dress/fleet
name = "fleet dress jacket"
desc = "A crisp white OCG Fleet dress jacket with blue and gold accents. Don't get near pasta sauce or vox."
/obj/item/clothing/suit/storage/toggle/dress/fleet/command
name = "fleet command dress jacket"
desc = "A crisp white OCG Fleet dress jacket dripping with gold accents. So bright it's blinding."
icon_state = "whitedress_com"
item_state = "labcoat"
blood_overlay_type = "coat"
/obj/item/clothing/suit/dress/marine
name = "marine dress jacket"
desc = "A tailored black OCG Marine Corps dress jacket with red trim. So sexy it hurts."
icon_state = "blackdress"
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
/obj/item/clothing/suit/dress/marine/command
name = "marine command dress jacket"
desc = "A tailored black OCG Marine Corps dress jacket with gold trim. Smells like ceremony."
icon_state = "blackdress_com"
//Misc
/obj/item/clothing/suit/storage/toggle/marshal_jacket
name = "colonial marshal jacket"
desc = "A black synthleather jacket. The word 'MARSHAL' is stenciled onto the back in gold lettering."
icon_state = "marshal_jacket"
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
body_parts_covered = UPPER_TORSO|ARMS
//OriCon Uniform Suits
//Service
/obj/item/clothing/suit/storage/service/sysguard
name = "explorer's jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons."
/obj/item/clothing/suit/storage/service/sysguard/medical
name = "explorer's medical jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and blue trim."
/obj/item/clothing/suit/storage/service/sysguard/medical/command
name = "explorer's medical command jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and blue trim."
/obj/item/clothing/suit/storage/service/sysguard/engineering
name = "explorer's engineering jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and orange trim."
/obj/item/clothing/suit/storage/service/sysguard/engineering/command
name = "explorer's engineering command jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and orange trim."
/obj/item/clothing/suit/storage/service/sysguard/supply
name = "explorer's supply jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and brown trim."
/obj/item/clothing/suit/storage/service/sysguard/security
name = "explorer's security jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and red trim."
/obj/item/clothing/suit/storage/service/sysguard/security/command
name = "explorer's security command jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and red trim."
/obj/item/clothing/suit/storage/service/sysguard/command
name = "explorer's command jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and gold trim."
/obj/item/clothing/suit/storage/service/marine
name = "marine coat"
desc = "An USDF Marine Corps service coat. Green and undecorated."
/obj/item/clothing/suit/storage/service/marine/medical
name = "marine medical jacket"
desc = "An USDF Marine Corps service coat. This one has blue markings."
/obj/item/clothing/suit/storage/service/marine/medical/command
name = "marine medical command jacket"
desc = "An USDF Marine Corps service coat. This one has blue and gold markings."
/obj/item/clothing/suit/storage/service/marine/engineering
name = "marine engineering jacket"
desc = "An USDF Marine Corps service coat. This one has orange markings."
/obj/item/clothing/suit/storage/service/marine/engineering/command
name = "marine engineering command jacket"
desc = "An USDF Marine Corps service coat. This one has orange and gold markings."
/obj/item/clothing/suit/storage/service/marine/supply
name = "marine supply jacket"
desc = "An USDF Marine Corps service coat. This one has brown markings."
/obj/item/clothing/suit/storage/service/marine/security
name = "marine security jacket"
desc = "An USDF Marine Corps service coat. This one has red markings."
/obj/item/clothing/suit/storage/service/marine/security/command
name = "marine security command jacket"
desc = "An USDF Marine Corps service coat. This one has red and gold markings."
/obj/item/clothing/suit/storage/service/marine/command
name = "marine command jacket"
desc = "An USDF Marine Corps service coat. This one has gold markings."
//Dress
/obj/item/clothing/suit/dress/expedition
name = "explorer's dress jacket"
desc = "A silver and grey dress jacket belonging to the Society of Universal Cartographers. Fashionable, for the 25th century at least."
/obj/item/clothing/suit/dress/expedition/command
name = "explorer's command dress jacket"
desc = "A gold and grey dress jacket belonging to the Society of Universal Cartographers. The height of fashion."
/obj/item/clothing/suit/storage/toggle/dress/fleet
name = "fleet dress jacket"
desc = "A crisp white USDF Fleet dress jacket with blue and gold accents. Don't get near pasta sauce or vox."
/obj/item/clothing/suit/storage/toggle/dress/fleet/command
name = "fleet command dress jacket"
desc = "A crisp white USDF Fleet dress jacket dripping with gold accents. So bright it's blinding."
/obj/item/clothing/suit/dress/marine
name = "marine dress jacket"
desc = "A tailored black USDF Marine Corps dress jacket with red trim. So sexy it hurts."
/obj/item/clothing/suit/dress/marine/command
name = "marine command dress jacket"
desc = "A tailored black USDF Marine Corps dress jacket with gold trim. Smells like ceremony."
/obj/item/clothing/suit/dress/marine/command/hos
name = "head of security's dress jacket"
desc = "A sleek, buttoned coat with gold trim. The fabric feels sturdy, could come in handy"
icon_state = "blackdress_com"
armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/dress/expedition/command/cd
name = "Facility Director's dress jacket"
desc = "A grey dress jacket, adorned with gold trim and buttons. Makes those wearing it look powerful."
icon_state = "greydress_com"

163
code/modules/clothing/suits/solgov.dm
View File

@@ -1,163 +0,0 @@
//SolGov Uniform Suits
//Service
/obj/item/clothing/suit/storage/service
name = "service jacket"
desc = "A uniform service jacket, plain and undecorated."
icon_state = "blackservice"
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
flags_inv = HIDEHOLSTER //VOREStation Add - These obviously do.
allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/flashlight,/obj/item/pen,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/analyzer,/obj/item/radio,/obj/item/barrier_tape_roll)
/obj/item/clothing/suit/storage/service/sifguard
name = "\improper SifGuard jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has silver buttons."
icon_state = "blackservice_crew"
/obj/item/clothing/suit/storage/service/sifguard/medical
name = "\improper SifGuard medical jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has silver buttons and blue trim."
icon_state = "blackservice_med"
/obj/item/clothing/suit/storage/service/sifguard/medical/command
name = "\improper SifGuard medical command jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has gold buttons and blue trim."
icon_state = "blackservice_medcom"
/obj/item/clothing/suit/storage/service/sifguard/engineering
name = "\improper SifGuard engineering jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has silver buttons and orange trim."
icon_state = "blackservice_eng"
/obj/item/clothing/suit/storage/service/sifguard/engineering/command
name = "\improper SifGuard engineering command jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has gold buttons and orange trim."
icon_state = "blackservice_engcom"
/obj/item/clothing/suit/storage/service/sifguard/supply
name = "\improper SifGuard supply jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has silver buttons and brown trim."
icon_state = "blackservice_sup"
/obj/item/clothing/suit/storage/service/sifguard/security
name = "\improper SifGuard security jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has silver buttons and red trim."
icon_state = "blackservice_sec"
/obj/item/clothing/suit/storage/service/sifguard/security/command
name = "\improper SifGuard security command jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has gold buttons and red trim."
icon_state = "blackservice_seccom"
/obj/item/clothing/suit/storage/service/sifguard/command
name = "\improper SifGuard command jacket"
desc = "A uniform service jacket belonging to the Sif Defense Force. It has gold buttons and gold trim."
icon_state = "blackservice_com"
/obj/item/clothing/suit/storage/service/marine
name = "marine coat"
desc = "An SCG Marine Corps service coat. Green and undecorated."
icon_state = "greenservice"
item_state_slots = list(slot_r_hand_str = "suit_olive", slot_l_hand_str = "suit_olive")
/obj/item/clothing/suit/storage/service/marine/medical
name = "marine medical jacket"
desc = "An SCG Marine Corps service coat. This one has blue markings."
icon_state = "greenservice_med"
/obj/item/clothing/suit/storage/service/marine/medical/command
name = "marine medical command jacket"
desc = "An SCG Marine Corps service coat. This one has blue and gold markings."
icon_state = "greenservice_medcom"
/obj/item/clothing/suit/storage/service/marine/engineering
name = "marine engineering jacket"
desc = "An SCG Marine Corps service coat. This one has orange markings."
icon_state = "greenservice_eng"
/obj/item/clothing/suit/storage/service/marine/engineering/command
name = "marine engineering command jacket"
desc = "An SCG Marine Corps service coat. This one has orange and gold markings."
icon_state = "greenservice_engcom"
/obj/item/clothing/suit/storage/service/marine/supply
name = "marine supply jacket"
desc = "An SCG Marine Corps service coat. This one has brown markings."
icon_state = "greenservice_sup"
/obj/item/clothing/suit/storage/service/marine/security
name = "marine security jacket"
desc = "An SCG Marine Corps service coat. This one has red markings."
icon_state = "greenservice_sec"
/obj/item/clothing/suit/storage/service/marine/security/command
name = "marine security command jacket"
desc = "An SCG Marine Corps service coat. This one has red and gold markings."
icon_state = "greenservice_seccom"
/obj/item/clothing/suit/storage/service/marine/command
name = "marine command jacket"
desc = "An SCG Marine Corps service coat. This one has gold markings."
icon_state = "greenservice_com"
//Dress
/obj/item/clothing/suit/dress
name = "dress jacket"
desc = "A uniform dress jacket, fancy."
icon_state = "greydress"
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
allowed = list(/obj/item/tank/emergency/oxygen,/obj/item/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/radio,/obj/item/pen)
/obj/item/clothing/suit/dress/expedition
name = "SifGuard dress jacket"
desc = "A silver and grey dress jacket belonging to the Sif Defense Force. Fashionable, for the 25th century at least."
icon_state = "greydress"
/obj/item/clothing/suit/dress/expedition/command
name = "SifGuard command dress jacket"
desc = "A gold and grey dress jacket belonging to the Sif Defense Force. The height of fashion."
icon_state = "greydress_com"
/obj/item/clothing/suit/storage/toggle/dress
name = "clasped dress jacket"
desc = "A uniform dress jacket with gold toggles."
icon_state = "whitedress"
item_state = "labcoat"
blood_overlay_type = "coat"
/obj/item/clothing/suit/storage/toggle/dress/fleet
name = "fleet dress jacket"
desc = "A crisp white SCG Fleet dress jacket with blue and gold accents. Don't get near pasta sauce or vox."
/obj/item/clothing/suit/storage/toggle/dress/fleet/command
name = "fleet command dress jacket"
desc = "A crisp white SCG Fleet dress jacket dripping with gold accents. So bright it's blinding."
icon_state = "whitedress_com"
item_state = "labcoat"
blood_overlay_type = "coat"
/obj/item/clothing/suit/dress/marine
name = "marine dress jacket"
desc = "A tailored black SCG Marine Corps dress jacket with red trim. So sexy it hurts."
icon_state = "blackdress"
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
/obj/item/clothing/suit/dress/marine/command
name = "marine command dress jacket"
desc = "A tailored black SCG Marine Corps dress jacket with gold trim. Smells like ceremony."
icon_state = "blackdress_com"
//Misc
/obj/item/clothing/suit/storage/toggle/marshal_jacket
name = "colonial marshal jacket"
desc = "A black synthleather jacket. The word 'MARSHAL' is stenciled onto the back in gold lettering."
icon_state = "marshal_jacket"
item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black")
body_parts_covered = UPPER_TORSO|ARMS

111
code/modules/clothing/suits/solgov_vr.dm
View File

@@ -1,111 +0,0 @@
//SolGov Uniform Suits
//Service
/obj/item/clothing/suit/storage/service/sifguard
name = "explorer's jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons."
/obj/item/clothing/suit/storage/service/sifguard/medical
name = "explorer's medical jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and blue trim."
/obj/item/clothing/suit/storage/service/sifguard/medical/command
name = "explorer's medical command jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and blue trim."
/obj/item/clothing/suit/storage/service/sifguard/engineering
name = "explorer's engineering jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and orange trim."
/obj/item/clothing/suit/storage/service/sifguard/engineering/command
name = "explorer's engineering command jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and orange trim."
/obj/item/clothing/suit/storage/service/sifguard/supply
name = "explorer's supply jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and brown trim."
/obj/item/clothing/suit/storage/service/sifguard/security
name = "explorer's security jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has silver buttons and red trim."
/obj/item/clothing/suit/storage/service/sifguard/security/command
name = "explorer's security command jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and red trim."
/obj/item/clothing/suit/storage/service/sifguard/command
name = "explorer's command jacket"
desc = "A uniform service jacket belonging to the Society of Universal Cartographers. It has gold buttons and gold trim."
/obj/item/clothing/suit/storage/service/marine
name = "marine coat"
desc = "An USDF Marine Corps service coat. Green and undecorated."
/obj/item/clothing/suit/storage/service/marine/medical
name = "marine medical jacket"
desc = "An USDF Marine Corps service coat. This one has blue markings."
/obj/item/clothing/suit/storage/service/marine/medical/command
name = "marine medical command jacket"
desc = "An USDF Marine Corps service coat. This one has blue and gold markings."
/obj/item/clothing/suit/storage/service/marine/engineering
name = "marine engineering jacket"
desc = "An USDF Marine Corps service coat. This one has orange markings."
/obj/item/clothing/suit/storage/service/marine/engineering/command
name = "marine engineering command jacket"
desc = "An USDF Marine Corps service coat. This one has orange and gold markings."
/obj/item/clothing/suit/storage/service/marine/supply
name = "marine supply jacket"
desc = "An USDF Marine Corps service coat. This one has brown markings."
/obj/item/clothing/suit/storage/service/marine/security
name = "marine security jacket"
desc = "An USDF Marine Corps service coat. This one has red markings."
/obj/item/clothing/suit/storage/service/marine/security/command
name = "marine security command jacket"
desc = "An USDF Marine Corps service coat. This one has red and gold markings."
/obj/item/clothing/suit/storage/service/marine/command
name = "marine command jacket"
desc = "An USDF Marine Corps service coat. This one has gold markings."
//Dress
/obj/item/clothing/suit/dress/expedition
name = "explorer's dress jacket"
desc = "A silver and grey dress jacket belonging to the Society of Universal Cartographers. Fashionable, for the 25th century at least."
/obj/item/clothing/suit/dress/expedition/command
name = "explorer's command dress jacket"
desc = "A gold and grey dress jacket belonging to the Society of Universal Cartographers. The height of fashion."
/obj/item/clothing/suit/storage/toggle/dress/fleet
name = "fleet dress jacket"
desc = "A crisp white USDF Fleet dress jacket with blue and gold accents. Don't get near pasta sauce or vox."
/obj/item/clothing/suit/storage/toggle/dress/fleet/command
name = "fleet command dress jacket"
desc = "A crisp white USDF Fleet dress jacket dripping with gold accents. So bright it's blinding."
/obj/item/clothing/suit/dress/marine
name = "marine dress jacket"
desc = "A tailored black USDF Marine Corps dress jacket with red trim. So sexy it hurts."
/obj/item/clothing/suit/dress/marine/command
name = "marine command dress jacket"
desc = "A tailored black USDF Marine Corps dress jacket with gold trim. Smells like ceremony."
/obj/item/clothing/suit/dress/marine/command/hos
name = "head of security's dress jacket"
desc = "A sleek, buttoned coat with gold trim. The fabric feels sturdy, could come in handy"
icon_state = "blackdress_com"
armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/dress/expedition/command/cd
name = "Facility Director's dress jacket"
desc = "A grey dress jacket, adorned with gold trim and buttons. Makes those wearing it look powerful."
icon_state = "greydress_com"

366
code/modules/clothing/under/accessories/torch.dm
View File

@@ -1,109 +1,109 @@
/*****
medals
*****/
/obj/item/clothing/accessory/medal/solgov/iron/star
/obj/item/clothing/accessory/medal/oricon/iron/star
name = "iron star medal"
desc = "An iron star awarded to members of the SCG for meritorious achievement or service in a combat zone."
desc = "An iron star awarded to members of the OCG for meritorious achievement or service in a combat zone."
icon_state = "iron_star"
/obj/item/clothing/accessory/medal/solgov/iron/sol
name = "\improper Sol expeditionary medal"
desc = "An iron medal awarded to members of the SCG for service outside of the borders of the Sol Central Government."
/obj/item/clothing/accessory/medal/oricon/iron/sol
name = "\improper Orion expeditionary medal"
desc = "An iron medal awarded to members of the OCG for service outside of the borders of the Orion Confederation."
icon_state = "iron_sol"
/obj/item/clothing/accessory/medal/solgov/bronze/heart
/obj/item/clothing/accessory/medal/oricon/bronze/heart
name = "bronze heart medal"
desc = "A bronze heart awarded to members of the SCG for injury or death in the line of duty."
desc = "A bronze heart awarded to members of the OCG for injury or death in the line of duty."
icon_state = "bronze_heart"
/obj/item/clothing/accessory/medal/solgov/bronze/sol
name = "\improper Sol defensive operations medal"
desc = "A bronze medal awarded for members of the SCG for service defending the border regions."
/obj/item/clothing/accessory/medal/oricon/bronze/sol
name = "\improper Orion defensive operations medal"
desc = "A bronze medal awarded for members of the OCG for service defending the border regions."
icon_state = "bronze_sol"
/obj/item/clothing/accessory/medal/solgov/silver/sword
/obj/item/clothing/accessory/medal/oricon/silver/sword
name = "combat action medal"
desc = "A silver medal awarded to members of the SCG for honorable service while under enemy fire."
desc = "A silver medal awarded to members of the OCG for honorable service while under enemy fire."
icon_state = "silver_sword"
/obj/item/clothing/accessory/medal/solgov/silver/sol
name = "\improper Sol valor medal"
desc = "A silver medal awarded for members of the SCG for acts of exceptional valor."
/obj/item/clothing/accessory/medal/oricon/silver/sol
name = "\improper Orion valor medal"
desc = "A silver medal awarded for members of the OCG for acts of exceptional valor."
icon_state = "silver_sol"
/obj/item/clothing/accessory/medal/solgov/gold/star
/obj/item/clothing/accessory/medal/oricon/gold/star
name = "gold star medal"
desc = "A gold star awarded to members of the SCG for acts of heroism in a combat zone."
desc = "A gold star awarded to members of the OCG for acts of heroism in a combat zone."
icon_state = "gold_star"
/obj/item/clothing/accessory/medal/solgov/gold/sun
/obj/item/clothing/accessory/medal/oricon/gold/sun
name = "solar service medal"
desc = "A gold medal awarded to members of the SCG by the Secretary General for significant contributions to the Sol Central Government."
desc = "A gold medal awarded to members of the OCG by the Secretary General for significant contributions to the Orion Confederation."
icon_state = "gold_sun"
/obj/item/clothing/accessory/medal/solgov/gold/crest
/obj/item/clothing/accessory/medal/oricon/gold/crest
name = "solar honor medal"
desc = "A gold medal awarded to members of the Defense Forces by the Secretary General for personal acts of valor and heroism above and beyond the call of duty."
icon_state = "gold_crest"
/obj/item/clothing/accessory/medal/solgov/gold/sol
name = "\improper Sol sapientarian medal"
desc = "A gold medal awarded for members of the SCG for significant contributions to sapient rights."
/obj/item/clothing/accessory/medal/oricon/gold/sol
name = "\improper Orion sapientarian medal"
desc = "A gold medal awarded for members of the OCG for significant contributions to sapient rights."
icon_state = "gold_sol"
/obj/item/clothing/accessory/medal/solgov/heart
/obj/item/clothing/accessory/medal/oricon/heart
name = "medical medal"
desc = "A white heart emblazoned with a red cross awarded to members of the SCG for service as a medical professional in a combat zone."
desc = "A white heart emblazoned with a red cross awarded to members of the OCG for service as a medical professional in a combat zone."
icon_state = "white_heart"
/obj/item/clothing/accessory/solgov/torch_patch
/obj/item/clothing/accessory/oricon/torch_patch
name = "\improper Torch mission patch"
desc = "A fire resistant shoulder patch, worn by the personnel involved in the Torch Project."
icon_state = "torchpatch"
on_rolled = list("down" = "none")
slot = ACCESSORY_SLOT_INSIGNIA
/obj/item/clothing/accessory/solgov/ec_patch
/obj/item/clothing/accessory/oricon/ec_patch
name = "\improper Observatory patch"
desc = "A laminated shoulder patch, carrying the symbol of the Sol Central Government Expeditionary Corpss Observatory, or SCGEO for short, the eyes and ears of the Expeditionary Corps' missions."
desc = "A laminated shoulder patch, carrying the symbol of the Orion Confederation Expeditionary Corpss Observatory, or OCGEO for short, the eyes and ears of the Expeditionary Corps' missions."
icon_state = "ecpatch1"
on_rolled = list("down" = "none")
slot = ACCESSORY_SLOT_INSIGNIA
/obj/item/clothing/accessory/solgov/ec_patch/fieldops
/obj/item/clothing/accessory/oricon/ec_patch/fieldops
name = "\improper Field Operations patch"
desc = "A radiation-shielded shoulder patch, carrying the symbol of the Sol Central Government Expeditionary Corps Field Operations, or SCGECFO for short, the hands-on workers of every Expeditionary Corps mission."
desc = "A radiation-shielded shoulder patch, carrying the symbol of the Orion Confederation Expeditionary Corps Field Operations, or OCGECFO for short, the hands-on workers of every Expeditionary Corps mission."
icon_state = "ecpatch2"
/obj/item/clothing/accessory/solgov/cultex_patch
/obj/item/clothing/accessory/oricon/cultex_patch
name = "\improper Cultural Exchange patch"
desc = "A radiation-shielded shoulder patch, denoting service in the the Sol Central Government Expeditionary Corps Cultural Exchange program."
desc = "A radiation-shielded shoulder patch, denoting service in the the Orion Confederation Expeditionary Corps Cultural Exchange program."
icon_state = "ecpatch3"
slot = ACCESSORY_SLOT_INSIGNIA
/obj/item/clothing/accessory/solgov/fleet_patch
/obj/item/clothing/accessory/oricon/fleet_patch
name = "\improper First Fleet patch"
desc = "A fancy shoulder patch carrying insignia of First Fleet, the Sol Guard, stationed in Sol."
desc = "A fancy shoulder patch carrying insignia of First Fleet, the Orion Guard, stationed in Orion."
icon_state = "fleetpatch1"
on_rolled = list("down" = "none")
slot = ACCESSORY_SLOT_INSIGNIA
/obj/item/clothing/accessory/solgov/fleet_patch/second
/obj/item/clothing/accessory/oricon/fleet_patch/second
name = "\improper Second Fleet patch"
desc = "A well-worn shoulder patch carrying insignia of Second Fleet, the Home Guard, tasked with defense of Sol territories."
desc = "A well-worn shoulder patch carrying insignia of Second Fleet, the Home Guard, tasked with defense of Orion territories."
icon_state = "fleetpatch2"
/obj/item/clothing/accessory/solgov/fleet_patch/third
/obj/item/clothing/accessory/oricon/fleet_patch/third
name = "\improper Third Fleet patch"
desc = "A scuffed shoulder patch carrying insignia of Third Fleet, the Border Guard, guarding borders of Sol territory against Vox and pirates."
desc = "A scuffed shoulder patch carrying insignia of Third Fleet, the Border Guard, guarding borders of Orion territory against Vox and pirates."
icon_state = "fleetpatch3"
/obj/item/clothing/accessory/solgov/fleet_patch/fourth
/obj/item/clothing/accessory/oricon/fleet_patch/fourth
name = "\improper Fourth Fleet patch"
desc = "A pristine shoulder patch carrying insignia of Fourth Fleet, stationed on Skrell border."
icon_state = "fleetpatch4"
/obj/item/clothing/accessory/solgov/fleet_patch/fifth
/obj/item/clothing/accessory/oricon/fleet_patch/fifth
name = "\improper Fifth Fleet patch"
desc = "A tactical shoulder patch carrying insignia of Fifth Fleet, the Quick Reaction Force, recently formed and outfited with last tech."
icon_state = "fleetpatch5"
@@ -111,106 +111,106 @@ medals
/******
ribbons
******/
/obj/item/clothing/accessory/ribbon/solgov
/obj/item/clothing/accessory/ribbon/oricon
name = "ribbon"
desc = "A simple military decoration."
icon_state = "ribbon_marksman"
on_rolled = list("down" = "none")
slot = ACCESSORY_SLOT_MEDAL
/obj/item/clothing/accessory/ribbon/solgov/marksman
/obj/item/clothing/accessory/ribbon/oricon/marksman
name = "marksmanship ribbon"
desc = "A military decoration awarded to members of the SCG for good marksmanship scores in training. Common in the days of energy weapons."
desc = "A military decoration awarded to members of the OCG for good marksmanship scores in training. Common in the days of energy weapons."
icon_state = "ribbon_marksman"
/obj/item/clothing/accessory/ribbon/solgov/peace
/obj/item/clothing/accessory/ribbon/oricon/peace
name = "peacekeeping ribbon"
desc = "A military decoration awarded to members of the SCG for service during a peacekeeping operation."
desc = "A military decoration awarded to members of the OCG for service during a peacekeeping operation."
icon_state = "ribbon_peace"
/obj/item/clothing/accessory/ribbon/solgov/frontier
/obj/item/clothing/accessory/ribbon/oricon/frontier
name = "frontier ribbon"
desc = "A military decoration awarded to members of the SCG for service along the frontier."
desc = "A military decoration awarded to members of the OCG for service along the frontier."
icon_state = "ribbon_frontier"
/obj/item/clothing/accessory/ribbon/solgov/instructor
/obj/item/clothing/accessory/ribbon/oricon/instructor
name = "instructor ribbon"
desc = "A military decoration awarded to members of the SCG for service as an instructor."
desc = "A military decoration awarded to members of the OCG for service as an instructor."
icon_state = "ribbon_instructor"
/*************
specialty pins
*************/
/obj/item/clothing/accessory/solgov/specialty
/obj/item/clothing/accessory/oricon/specialty
name = "speciality blaze"
desc = "A color blaze denoting fleet personnel in some special role. This one is silver."
icon_state = "marinerank_command"
slot = ACCESSORY_SLOT_INSIGNIA
/obj/item/clothing/accessory/solgov/specialty/janitor
/obj/item/clothing/accessory/oricon/specialty/janitor
name = "custodial blazes"
desc = "Purple blazes denoting a custodial technician."
icon_state = "fleetspec_janitor"
/obj/item/clothing/accessory/solgov/specialty/brig
/obj/item/clothing/accessory/oricon/specialty/brig
name = "brig blazes"
desc = "Red blazes denoting a brig officer."
icon_state = "fleetspec_brig"
/obj/item/clothing/accessory/solgov/specialty/forensic
/obj/item/clothing/accessory/oricon/specialty/forensic
name = "forensics blazes"
desc = "Steel blazes denoting a forensic technician."
icon_state = "fleetspec_forensic"
/obj/item/clothing/accessory/solgov/specialty/atmos
/obj/item/clothing/accessory/oricon/specialty/atmos
name = "atmospherics blazes"
desc = "Turquoise blazes denoting an atmospheric technician."
icon_state = "fleetspec_atmos"
/obj/item/clothing/accessory/solgov/specialty/counselor
/obj/item/clothing/accessory/oricon/specialty/counselor
name = "counselor blazes"
desc = "Blue blazes denoting a counselor."
icon_state = "fleetspec_counselor"
/obj/item/clothing/accessory/solgov/specialty/chemist
/obj/item/clothing/accessory/oricon/specialty/chemist
name = "chemistry blazes"
desc = "Orange blazes denoting a chemist."
icon_state = "fleetspec_chemist"
/obj/item/clothing/accessory/solgov/specialty/enlisted
/obj/item/clothing/accessory/oricon/specialty/enlisted
name = "enlisted qualification pin"
desc = "An iron pin denoting some special qualification."
icon_state = "fleetpin_enlisted"
/obj/item/clothing/accessory/solgov/specialty/officer
/obj/item/clothing/accessory/oricon/specialty/officer
name = "officer's qualification pin"
desc = "A golden pin denoting some special qualification."
icon_state = "fleetpin_officer"
/obj/item/clothing/accessory/solgov/specialty/pilot
/obj/item/clothing/accessory/oricon/specialty/pilot
name = "pilot's qualification pin"
desc = "An iron pin denoting the qualification to fly SCG spacecraft."
desc = "An iron pin denoting the qualification to fly OCG spacecraft."
icon_state = "pin_pilot"
/*****
badges
*****/
/obj/item/clothing/accessory/badge/solgov/security
/obj/item/clothing/accessory/badge/oricon/security
name = "security forces badge"
desc = "A silver law enforcement badge. Stamped with the words 'Master at Arms'."
icon_state = "silverbadge"
slot_flags = SLOT_TIE
badge_string = "Sol Central Government"
badge_string = "Orion Confederation"
/obj/item/clothing/accessory/badge/solgov/tags
/obj/item/clothing/accessory/badge/oricon/tags
name = "dog tags"
desc = "Plain identification tags made from a durable metal. They are stamped with a variety of informational details."
gender = PLURAL
icon_state = "tags"
badge_string = "Sol Central Government"
badge_string = "Orion Confederation"
slot_flags = SLOT_MASK | SLOT_TIE
/obj/item/clothing/accessory/badge/solgov/tags/Initialize(mapload)
/obj/item/clothing/accessory/badge/oricon/tags/Initialize(mapload)
. = ..()
var/mob/living/carbon/human/H
H = get_holder_of_type(src, /mob/living/carbon/human)
@@ -218,28 +218,28 @@ badges
set_name(H.real_name)
set_desc(H)
/obj/item/clothing/accessory/badge/solgov/tags/set_desc(var/mob/living/carbon/human/H)
/obj/item/clothing/accessory/badge/oricon/tags/set_desc(var/mob/living/carbon/human/H)
if(!istype(H))
return
var/religion = "Unset"
desc = "[initial(desc)]\nName: [H.real_name] ([H.get_species()])\nReligion: [religion]\nBlood type: [H.b_type]"
/obj/item/clothing/accessory/badge/solgov/representative
/obj/item/clothing/accessory/badge/oricon/representative
name = "representative's badge"
desc = "A leather-backed plastic badge with a variety of information printed on it. Belongs to a representative of the Sol Central Government."
desc = "A leather-backed plastic badge with a variety of information printed on it. Belongs to a representative of the Orion Confederation."
icon_state = "solbadge"
slot_flags = SLOT_TIE
badge_string = "Sol Central Government"
badge_string = "Orion Confederation"
/*******
armbands
*******/
/obj/item/clothing/accessory/armband/solgov/mp
/obj/item/clothing/accessory/armband/oricon/mp
name = "military police brassard"
desc = "An armlet, worn by the crew to display which department they're assigned to. This one is black with 'MP' in white."
icon_state = "mpband"
/obj/item/clothing/accessory/armband/solgov/ma
/obj/item/clothing/accessory/armband/oricon/ma
name = "master at arms brassard"
desc = "An armlet, worn by the crew to display which department they're assigned to. This one is white with 'MA' in navy blue."
icon_state = "maband"
@@ -247,49 +247,49 @@ armbands
/*****************
armour attachments
*****************/
/obj/item/clothing/accessory/armor/tag/solgov
name = "\improper SCG Flag"
desc = "An emblem depicting the Sol Central Government's flag."
/obj/item/clothing/accessory/armor/tag/oricon
name = "\improper OCG Flag"
desc = "An emblem depicting the Orion Confederation's flag."
icon_state = "solflag"
slot = ACCESSORY_SLOT_ARMOR_M
/obj/item/clothing/accessory/armor/tag/solgov/ec
/obj/item/clothing/accessory/armor/tag/oricon/ec
name = "\improper Expeditionary Corps crest"
desc = "An emblem depicting the crest of the SCG Expeditionary Corps."
desc = "An emblem depicting the crest of the OCG Expeditionary Corps."
icon_state = "ecflag"
/obj/item/clothing/accessory/armor/tag/solgov/sec
/obj/item/clothing/accessory/armor/tag/oricon/sec
name = "\improper POLICE tag"
desc = "An armor tag with the word POLICE printed in silver lettering on it."
icon_state = "sectag"
/obj/item/clothing/accessory/armor/tag/solgov/medic
/obj/item/clothing/accessory/armor/tag/oricon/medic
name = "\improper MEDIC tag"
desc = "An armor tag with the word MEDIC printed in red lettering on it."
icon_state = "medictag"
/obj/item/clothing/accessory/armor/tag/solgov/agent
/obj/item/clothing/accessory/armor/tag/oricon/agent
name = "\improper OCIE AGENT tag"
desc = "An armor tag with the word OCIE AGENT printed in gold lettering on it."
icon_state = "agenttag"
/obj/item/clothing/accessory/armor/tag/solgov/com
name = "\improper SCG tag"
/obj/item/clothing/accessory/armor/tag/oricon/com
name = "\improper OCG tag"
desc = "An armor tag with the words SOL CENTRAL GOVERNMENT printed in gold lettering on it."
icon_state = "comtag"
/obj/item/clothing/accessory/armor/tag/solgov/com/sec
/obj/item/clothing/accessory/armor/tag/oricon/com/sec
name = "\improper POLICE tag"
desc = "An armor tag with the words POLICE printed in gold lettering on it."
/obj/item/clothing/accessory/armor/helmcover/blue/sol
name = "peacekeeper helmet cover"
desc = "A fabric cover for armored helmets. This one is in SCG peacekeeper colors."
desc = "A fabric cover for armored helmets. This one is in OCG peacekeeper colors."
/**************
department tags
**************/
/obj/item/clothing/accessory/solgov/department
/obj/item/clothing/accessory/oricon/department
name = "department insignia"
desc = "Insignia denoting assignment to a department. These appear blank."
icon_state = "dept_exped"
@@ -297,145 +297,145 @@ department tags
slot = ACCESSORY_SLOT_DECOR
//removable = FALSE
/obj/item/clothing/accessory/solgov/department/command
/obj/item/clothing/accessory/oricon/department/command
name = "command insignia"
desc = "Insignia denoting assignment to the command department. These fit Expeditionary Corps uniforms."
color = "#e5ea4f"
/obj/item/clothing/accessory/solgov/department/command/service
/obj/item/clothing/accessory/oricon/department/command/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/command/fleet
/obj/item/clothing/accessory/oricon/department/command/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the command department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/command/marine
/obj/item/clothing/accessory/oricon/department/command/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the command department. These fit marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/engineering
/obj/item/clothing/accessory/oricon/department/engineering
name = "engineering insignia"
desc = "Insignia denoting assignment to the engineering department. These fit Expeditionary Corps uniforms."
color = "#ff7f00"
/obj/item/clothing/accessory/solgov/department/engineering/service
/obj/item/clothing/accessory/oricon/department/engineering/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/engineering/fleet
/obj/item/clothing/accessory/oricon/department/engineering/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the engineering department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/engineering/marine
/obj/item/clothing/accessory/oricon/department/engineering/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the engineering department. These fit marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/security
/obj/item/clothing/accessory/oricon/department/security
name = "security insignia"
desc = "Insignia denoting assignment to the security department. These fit Expeditionary Corps uniforms."
color = "#bf0000"
/obj/item/clothing/accessory/solgov/department/security/service
/obj/item/clothing/accessory/oricon/department/security/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/security/fleet
/obj/item/clothing/accessory/oricon/department/security/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the security department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/security/marine
/obj/item/clothing/accessory/oricon/department/security/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the security department. These fit marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/medical
/obj/item/clothing/accessory/oricon/department/medical
name = "medical insignia"
desc = "Insignia denoting assignment to the medical department. These fit Expeditionary Corps uniforms."
color = "#4c9ce4"
/obj/item/clothing/accessory/solgov/department/medical/service
/obj/item/clothing/accessory/oricon/department/medical/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/medical/fleet
/obj/item/clothing/accessory/oricon/department/medical/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the medical department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/medical/marine
/obj/item/clothing/accessory/oricon/department/medical/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the medical department. These fit marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/supply
/obj/item/clothing/accessory/oricon/department/supply
name = "supply insignia"
desc = "Insignia denoting assignment to the supply department. These fit Expeditionary Corps uniforms."
color = "#bb9042"
/obj/item/clothing/accessory/solgov/department/supply/service
/obj/item/clothing/accessory/oricon/department/supply/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/supply/fleet
/obj/item/clothing/accessory/oricon/department/supply/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the supply department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/supply/marine
/obj/item/clothing/accessory/oricon/department/supply/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the supply department. These fit marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/service
/obj/item/clothing/accessory/oricon/department/service
name = "service insignia"
desc = "Insignia denoting assignment to the service department. These fit Expeditionary Corps uniforms."
color = "#6eaa2c"
/obj/item/clothing/accessory/solgov/department/service/service
/obj/item/clothing/accessory/oricon/department/service/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/service/fleet
/obj/item/clothing/accessory/oricon/department/service/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the service department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/service/marine
/obj/item/clothing/accessory/oricon/department/service/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the service department. These fit marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/exploration
/obj/item/clothing/accessory/oricon/department/exploration
name = "exploration insignia"
desc = "Insignia denoting assignment to the exploration department. These fit Expeditionary Corps uniforms."
color = "#68099e"
/obj/item/clothing/accessory/solgov/department/exploration/service
/obj/item/clothing/accessory/oricon/department/exploration/service
icon_state = "dept_exped_service"
/obj/item/clothing/accessory/solgov/department/exploration/fleet
/obj/item/clothing/accessory/oricon/department/exploration/fleet
icon_state = "dept_fleet"
desc = "Insignia denoting assignment to the exploration department. These fit Fleet uniforms."
on_rolled = list("rolled" = "dept_fleet_sleeves", "down" = "none")
/obj/item/clothing/accessory/solgov/department/exploration/marine
/obj/item/clothing/accessory/oricon/department/exploration/marine
icon_state = "dept_marine"
desc = "Insignia denoting assignment to the exploration department. These fit marine uniforms."
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/department/research
/obj/item/clothing/accessory/oricon/department/research
name = "research insignia"
desc = "Insignia denoting assignment to the research department. These fit Expeditionary Corps uniforms."
color = "#68099e"
/obj/item/clothing/accessory/solgov/department/research/service
/obj/item/clothing/accessory/oricon/department/research/service
icon_state = "dept_exped_service"
/*********
ranks - ec
*********/
/obj/item/clothing/accessory/solgov/rank
/obj/item/clothing/accessory/oricon/rank
name = "ranks"
desc = "Insignia denoting rank of some kind. These appear blank."
icon_state = "fleetrank"
@@ -444,53 +444,53 @@ ranks - ec
gender = PLURAL
//high_visibility = 1
/obj/item/clothing/accessory/solgov/rank/ec
/obj/item/clothing/accessory/oricon/rank/ec
name = "explorer ranks"
desc = "Insignia denoting rank of some kind. These appear blank."
icon_state = "ecrank_e1"
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/rank/ec/enlisted
/obj/item/clothing/accessory/oricon/rank/ec/enlisted
name = "ranks (E-1 apprentice explorer)"
desc = "Insignia denoting the rank of Apprentice Explorer."
icon_state = "ecrank_e1"
/obj/item/clothing/accessory/solgov/rank/ec/enlisted/e3
/obj/item/clothing/accessory/oricon/rank/ec/enlisted/e3
name = "ranks (E-3 explorer)"
desc = "Insignia denoting the rank of Explorer."
icon_state = "ecrank_e3"
/obj/item/clothing/accessory/solgov/rank/ec/enlisted/e5
/obj/item/clothing/accessory/oricon/rank/ec/enlisted/e5
name = "ranks (E-5 senior explorer)"
desc = "Insignia denoting the rank of Senior Explorer."
icon_state = "ecrank_e5"
/obj/item/clothing/accessory/solgov/rank/ec/enlisted/e7
/obj/item/clothing/accessory/oricon/rank/ec/enlisted/e7
name = "ranks (E-7 chief explorer)"
desc = "Insignia denoting the rank of Chief Explorer."
icon_state = "ecrank_e7"
/obj/item/clothing/accessory/solgov/rank/ec/officer
/obj/item/clothing/accessory/oricon/rank/ec/officer
name = "ranks (O-1 ensign)"
desc = "Insignia denoting the rank of Ensign."
icon_state = "ecrank_o1"
/obj/item/clothing/accessory/solgov/rank/ec/officer/o3
/obj/item/clothing/accessory/oricon/rank/ec/officer/o3
name = "ranks (O-3 lieutenant)"
desc = "Insignia denoting the rank of Lieutenant."
icon_state = "ecrank_o3"
/obj/item/clothing/accessory/solgov/rank/ec/officer/o5
/obj/item/clothing/accessory/oricon/rank/ec/officer/o5
name = "ranks (O-5 commander)"
desc = "Insignia denoting the rank of Commander."
icon_state = "ecrank_o5"
/obj/item/clothing/accessory/solgov/rank/ec/officer/o6
/obj/item/clothing/accessory/oricon/rank/ec/officer/o6
name = "ranks (O-6 captain)"
desc = "Insignia denoting the rank of Captain."
icon_state = "ecrank_o6"
/obj/item/clothing/accessory/solgov/rank/ec/officer/o8
/obj/item/clothing/accessory/oricon/rank/ec/officer/o8
name = "ranks (O-8 admiral)"
desc = "Insignia denoting the rank of Admiral."
icon_state = "ecrank_o8"
@@ -498,240 +498,240 @@ ranks - ec
/************
ranks - fleet
************/
/obj/item/clothing/accessory/solgov/rank/fleet
/obj/item/clothing/accessory/oricon/rank/fleet
name = "naval ranks"
desc = "Insignia denoting naval rank of some kind. These appear blank."
icon_state = "fleetrank"
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted
name = "ranks (E-1 crewman recruit)"
desc = "Insignia denoting the rank of Crewman Recruit."
icon_state = "fleetrank_enlisted"
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e2
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e2
name = "ranks (E-2 crewman apprentice)"
desc = "Insignia denoting the rank of Crewman Apprentice."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e3
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e3
name = "ranks (E-3 crewman)"
desc = "Insignia denoting the rank of Crewman."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e4
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e4
name = "ranks (E-4 petty officer third class)"
desc = "Insignia denoting the rank of Petty Officer Third Class."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e5
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e5
name = "ranks (E-5 petty officer second class)"
desc = "Insignia denoting the rank of Petty Officer Second Class."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e6
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e6
name = "ranks (E-6 petty officer first class)"
desc = "Insignia denoting the rank of Petty Officer First Class."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e7
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e7
name = "ranks (E-7 chief petty officer)"
desc = "Insignia denoting the rank of Chief Petty Officer."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e8
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e8
name = "ranks (E-8 senior chief petty officer)"
desc = "Insignia denoting the rank of Senior Chief Petty Officer."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e9
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e9
name = "ranks (E-9 master chief petty officer)"
desc = "Insignia denoting the rank of Master Chief Petty Officer."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e9_alt1
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e9_alt1
name = "ranks (E-9 command master chief petty officer)"
desc = "Insignia denoting the rank of Command Master Chief Petty Officer."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e9_alt2
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e9_alt2
name = "ranks (E-9 fleet master chief petty officer)"
desc = "Insignia denoting the rank of Fleet Master Chief Petty Officer."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e9_alt3
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e9_alt3
name = "ranks (E-9 force master chief petty officer)"
desc = "Insignia denoting the rank of Force Master Chief Petty Officer."
/obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e9_alt4
/obj/item/clothing/accessory/oricon/rank/fleet/enlisted/e9_alt4
name = "ranks (E-9 master chief petty officer of the Fleet)"
desc = "Insignia denoting the rank of Master Chief Petty Officer of the Fleet."
/obj/item/clothing/accessory/solgov/rank/fleet/officer
/obj/item/clothing/accessory/oricon/rank/fleet/officer
name = "ranks (O-1 ensign)"
desc = "Insignia denoting the rank of Ensign."
icon_state = "fleetrank_officer"
/obj/item/clothing/accessory/solgov/rank/fleet/officer/wo1_monkey
/obj/item/clothing/accessory/oricon/rank/fleet/officer/wo1_monkey
name = "makeshift ranks (WO-1 warrant officer 1)"
desc = "Insignia denoting the mythical rank of Warrant Officer. Too bad it's obviously fake."
/obj/item/clothing/accessory/solgov/rank/fleet/officer/o2
/obj/item/clothing/accessory/oricon/rank/fleet/officer/o2
name = "ranks (O-2 sub-lieutenant)"
desc = "Insignia denoting the rank of Sub-lieutenant."
/obj/item/clothing/accessory/solgov/rank/fleet/officer/o3
/obj/item/clothing/accessory/oricon/rank/fleet/officer/o3
name = "ranks (O-3 lieutenant)"
desc = "Insignia denoting the rank of Lieutenant."
/obj/item/clothing/accessory/solgov/rank/fleet/officer/o4
/obj/item/clothing/accessory/oricon/rank/fleet/officer/o4
name = "ranks (O-4 lieutenant commander)"
desc = "Insignia denoting the rank of Lieutenant Commander."
/obj/item/clothing/accessory/solgov/rank/fleet/officer/o5
/obj/item/clothing/accessory/oricon/rank/fleet/officer/o5
name = "ranks (O-5 commander)"
desc = "Insignia denoting the rank of Commander."
/obj/item/clothing/accessory/solgov/rank/fleet/officer/o6
/obj/item/clothing/accessory/oricon/rank/fleet/officer/o6
name = "ranks (O-6 captain)"
desc = "Insignia denoting the rank of Captain."
icon_state = "fleetrank_command"
/obj/item/clothing/accessory/solgov/rank/fleet/flag
/obj/item/clothing/accessory/oricon/rank/fleet/flag
name = "ranks (O-7 commodore)"
desc = "Insignia denoting the rank of Commodore."
icon_state = "fleetrank_command"
/obj/item/clothing/accessory/solgov/rank/fleet/flag/o8
/obj/item/clothing/accessory/oricon/rank/fleet/flag/o8
name = "ranks (O-8 rear admiral)"
desc = "Insignia denoting the rank of Rear Admiral."
/obj/item/clothing/accessory/solgov/rank/fleet/flag/o9
/obj/item/clothing/accessory/oricon/rank/fleet/flag/o9
name = "ranks (O-9 vice admiral)"
desc = "Insignia denoting the rank of Vice Admiral."
/obj/item/clothing/accessory/solgov/rank/fleet/flag/o10
/obj/item/clothing/accessory/oricon/rank/fleet/flag/o10
name = "ranks (O-10 admiral)"
desc = "Insignia denoting the rank of Admiral."
/obj/item/clothing/accessory/solgov/rank/fleet/flag/o10_alt
/obj/item/clothing/accessory/oricon/rank/fleet/flag/o10_alt
name = "ranks (O-10 fleet admiral)"
desc = "Insignia denoting the rank of Fleet Admiral."
/**************
ranks - marines
**************/
/obj/item/clothing/accessory/solgov/rank/marine
/obj/item/clothing/accessory/oricon/rank/marine
name = "marine ranks"
desc = "Insignia denoting marine rank of some kind. These appear blank."
icon_state = "marinerank_enlisted"
on_rolled = list("down" = "none")
/obj/item/clothing/accessory/solgov/rank/marine/enlisted
/obj/item/clothing/accessory/oricon/rank/marine/enlisted
name = "ranks (E-1 private)"
desc = "Insignia denoting the rank of Private."
icon_state = "marinerank_enlisted"
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e2
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e2
name = "ranks (E-2 private second class)"
desc = "Insignia denoting the rank of Private Second Class."
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e3
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e3
name = "ranks (E-3 private first class)"
desc = "Insignia denoting the rank of Private First Class."
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e4
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e4
name = "ranks (E-4 corporal)"
desc = "Insignia denoting the rank of Corporal."
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e5
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e5
name = "ranks (E-5 sergeant)"
desc = "Insignia denoting the rank of Sergeant."
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e6
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e6
name = "ranks (E-6 staff sergeant)"
desc = "Insignia denoting the rank of Staff Sergeant."
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e7
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e7
name = "ranks (E-7 sergeant first class)"
desc = "Insignia denoting the rank of Sergeant First Class."
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e8
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e8
name = "ranks (E-8 master sergeant)"
desc = "Insignia denoting the rank of Master Sergeant."
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e8_alt
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e8_alt
name = "ranks (E-8 first sergeant)"
desc = "Insignia denoting the rank of First Sergeant."
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e9
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e9
name = "ranks (E-9 sergeant major)"
desc = "Insignia denoting the rank of Sergeant Major."
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e9_alt1
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e9_alt1
name = "ranks (E-9 command sergeant major)"
desc = "Insignia denoting the rank of Command Sergeant Major."
/obj/item/clothing/accessory/solgov/rank/marine/enlisted/e9_alt2
/obj/item/clothing/accessory/oricon/rank/marine/enlisted/e9_alt2
name = "ranks (E-9 sergeant major of the marine)"
desc = "Insignia denoting the rank of Sergeant Major of the marine."
/obj/item/clothing/accessory/solgov/rank/marine/officer
/obj/item/clothing/accessory/oricon/rank/marine/officer
name = "ranks (O-1 second lieutenant)"
desc = "Insignia denoting the rank of Second Lieutenant."
icon_state = "marinerank_officer"
/obj/item/clothing/accessory/solgov/rank/marine/officer/o2
/obj/item/clothing/accessory/oricon/rank/marine/officer/o2
name = "ranks (O-2 first lieutenant)"
desc = "Insignia denoting the rank of First Lieutenant."
/obj/item/clothing/accessory/solgov/rank/marine/officer/o3
/obj/item/clothing/accessory/oricon/rank/marine/officer/o3
name = "ranks (O-3 captain)"
desc = "Insignia denoting the rank of Captain."
/obj/item/clothing/accessory/solgov/rank/marine/officer/o4
/obj/item/clothing/accessory/oricon/rank/marine/officer/o4
name = "ranks (O-4 major)"
desc = "Insignia denoting the rank of Major."
/obj/item/clothing/accessory/solgov/rank/marine/officer/o5
/obj/item/clothing/accessory/oricon/rank/marine/officer/o5
name = "ranks (O-5 lieutenant colonel)"
desc = "Insignia denoting the rank of Lieutenant Colonel."
/obj/item/clothing/accessory/solgov/rank/marine/officer/o6
/obj/item/clothing/accessory/oricon/rank/marine/officer/o6
name = "ranks (O-6 colonel)"
desc = "Insignia denoting the rank of Colonel."
/obj/item/clothing/accessory/solgov/rank/marine/flag
/obj/item/clothing/accessory/oricon/rank/marine/flag
name = "ranks (O-7 brigadier general)"
desc = "Insignia denoting the rank of Brigadier General."
icon_state = "marinerank_command"
/obj/item/clothing/accessory/solgov/rank/marine/flag/o8
/obj/item/clothing/accessory/oricon/rank/marine/flag/o8
name = "ranks (O-8 major general)"
desc = "Insignia denoting the rank of Major General."
/obj/item/clothing/accessory/solgov/rank/marine/flag/o9
/obj/item/clothing/accessory/oricon/rank/marine/flag/o9
name = "ranks (O-9 lieutenant general)"
desc = "Insignia denoting the rank of lieutenant general."
/obj/item/clothing/accessory/solgov/rank/marine/flag/o10
/obj/item/clothing/accessory/oricon/rank/marine/flag/o10
name = "ranks (O-10 general)"
desc = "Insignia denoting the rank of General."
/obj/item/clothing/accessory/solgov/rank/marine/flag/o10_alt
/obj/item/clothing/accessory/oricon/rank/marine/flag/o10_alt
name = "ranks (O-10 field marshal)"
desc = "Insignia denoting the rank of Field Marshal."
/obj/item/clothing/accessory/solgov/department/command
/obj/item/clothing/accessory/oricon/department/command
desc = "Insignia denoting assignment to the command department. These fit Society of Universal Cartographers uniforms."
/obj/item/clothing/accessory/solgov/department/engineering
/obj/item/clothing/accessory/oricon/department/engineering
desc = "Insignia denoting assignment to the engineering department. These fit Society of Universal Cartographers uniforms."
/obj/item/clothing/accessory/solgov/department/security
/obj/item/clothing/accessory/oricon/department/security
desc = "Insignia denoting assignment to the security department. These fit Society of Universal Cartographers uniforms."
/obj/item/clothing/accessory/solgov/department/medical
/obj/item/clothing/accessory/oricon/department/medical
desc = "Insignia denoting assignment to the medical department. These fit Society of Universal Cartographers uniforms."
/obj/item/clothing/accessory/solgov/department/supply
/obj/item/clothing/accessory/oricon/department/supply
desc = "Insignia denoting assignment to the supply department. These fit Society of Universal Cartographers uniforms."
/obj/item/clothing/accessory/solgov/department/exploration
/obj/item/clothing/accessory/oricon/department/exploration
desc = "Insignia denoting assignment to the exploration department. These fit Society of Universal Cartographers uniforms."
/obj/item/clothing/accessory/solgov/department/research
/obj/item/clothing/accessory/oricon/department/research
desc = "Insignia denoting assignment to the research department. These fit Society of Universal Cartographers uniforms."
/obj/item/clothing/accessory/solgov/department/service
/obj/item/clothing/accessory/oricon/department/service
desc = "Insignia denoting assignment to the service department. These fit Society of Universal Cartographers uniforms."

107
code/modules/clothing/under/miscellaneous.dm
View File

@@ -40,7 +40,7 @@
/obj/item/clothing/under/customs
name = "customs uniform"
desc = "A standard SolGov customs uniform. Complete with epaulettes."
desc = "A standard OriCon customs uniform. Complete with epaulettes."
icon_state = "cu_suit"
/obj/item/clothing/under/customs/khaki
@@ -1529,3 +1529,108 @@
name = "blue tracksuit"
desc = "A dark blue tracksuit. It calls to mind images of excercise, particularly squats."
icon_state = "tracksuit_blue"
/obj/item/clothing/var/hides_bulges = FALSE // OwO wats this?
/obj/item/clothing/under/permit
name = "public nudity permit"
desc = "This permit entitles the bearer to conduct their duties without a uniform. Normally issued to furred crewmembers or those with nothing to hide."
icon = 'icons/obj/card_cit.dmi'
icon_state = "permit-civilian"
body_parts_covered = 0
equip_sound = null
sprite_sheets = list()
item_state = "golem" //This is dumb and hacky but was here when I got here.
worn_state = "golem" //It's basically just a coincidentally black iconstate in the file.
/obj/item/clothing/under/bluespace
name = "bluespace jumpsuit"
icon_state = "lingchameleon"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_uniforms.dmi',
)
item_state = "lingchameleon"
worn_state = "lingchameleon"
desc = "Do you feel like warping spacetime today? Because it seems like that's on the agenda, now. \
Allows one to resize themselves at will, and conceals their true weight."
hides_bulges = TRUE
var/original_size
/obj/item/clothing/under/bluespace/verb/toggle_fibers()
set category = "Object"
set name = "Adjust fibers"
set desc = "Adjust your suit fibers. This makes it so your stomach(s) will show or not."
set src in usr
adjust_fibers(usr)
/obj/item/clothing/under/bluespace/proc/adjust_fibers(mob/user)
if(hides_bulges == FALSE)
hides_bulges = TRUE
to_chat(user, "You tense the suit fibers, hiding your stomach(s).")
else
hides_bulges = FALSE
to_chat(user, "You relax the suit fibers, showing your stomach(s).")
/obj/item/clothing/under/bluespace/verb/resize()
set name = "Adjust Size"
set category = "Object"
set src in usr
bluespace_size(usr)
/obj/item/clothing/under/bluespace/proc/bluespace_size(mob/usr as mob)
if (!ishuman(usr))
return
var/mob/living/carbon/human/H = usr
if (H.stat || H.restrained())
return
if (src != H.w_uniform)
to_chat(H,"<span class='warning'>You must be WEARING the uniform to change your size.</span>")
return
var/new_size = input("Put the desired size (25-200%)", "Set Size", 200) as num|null
//Check AGAIN because we accepted user input which is blocking.
if (src != H.w_uniform)
to_chat(H,"<span class='warning'>You must be WEARING the uniform to change your size.</span>")
return
if (H.stat || H.restrained())
return
if (isnull(H.size_multiplier))
to_chat(H,"<span class='warning'>The uniform panics and corrects your apparently microscopic size.</span>")
H.resize(RESIZE_NORMAL)
H.update_icons() //Just want the matrix transform
return
if (!ISINRANGE(new_size,25,200))
to_chat(H,"<span class='notice'>The safety features of the uniform prevent you from choosing this size.</span>")
return
else if(new_size)
if(new_size != H.size_multiplier)
if(!original_size)
original_size = H.size_multiplier
H.resize(new_size/100)
H.visible_message("<span class='warning'>The space around [H] distorts as they change size!</span>","<span class='notice'>The space around you distorts as you change size!</span>")
else //They chose their current size.
return
/obj/item/clothing/under/bluespace/mob_can_unequip(mob/M, slot, disable_warning = 0)
. = ..()
if(. && ishuman(M) && original_size)
var/mob/living/carbon/human/H = M
H.resize(original_size)
original_size = null
H.visible_message("<span class='warning'>The space around [H] distorts as they return to their original size!</span>","<span class='notice'>The space around you distorts as you return to your original size!</span>")
//Same as Nanotrasen Security Uniforms
/obj/item/clothing/under/ert
armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0)

104
code/modules/clothing/under/miscellaneous_vr.dm
View File

@@ -1,104 +0,0 @@
/obj/item/clothing/var/hides_bulges = FALSE // OwO wats this?
/obj/item/clothing/under/permit
name = "public nudity permit"
desc = "This permit entitles the bearer to conduct their duties without a uniform. Normally issued to furred crewmembers or those with nothing to hide."
icon = 'icons/obj/card_cit.dmi'
icon_state = "permit-civilian"
body_parts_covered = 0
equip_sound = null
sprite_sheets = list()
item_state = "golem" //This is dumb and hacky but was here when I got here.
worn_state = "golem" //It's basically just a coincidentally black iconstate in the file.
/obj/item/clothing/under/bluespace
name = "bluespace jumpsuit"
icon_state = "lingchameleon"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_uniforms.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_uniforms.dmi',
)
item_state = "lingchameleon"
worn_state = "lingchameleon"
desc = "Do you feel like warping spacetime today? Because it seems like that's on the agenda, now. \
Allows one to resize themselves at will, and conceals their true weight."
hides_bulges = TRUE
var/original_size
/obj/item/clothing/under/bluespace/verb/toggle_fibers()
set category = "Object"
set name = "Adjust fibers"
set desc = "Adjust your suit fibers. This makes it so your stomach(s) will show or not."
set src in usr
adjust_fibers(usr)
/obj/item/clothing/under/bluespace/proc/adjust_fibers(mob/user)
if(hides_bulges == FALSE)
hides_bulges = TRUE
to_chat(user, "You tense the suit fibers, hiding your stomach(s).")
else
hides_bulges = FALSE
to_chat(user, "You relax the suit fibers, showing your stomach(s).")
/obj/item/clothing/under/bluespace/verb/resize()
set name = "Adjust Size"
set category = "Object"
set src in usr
bluespace_size(usr)
/obj/item/clothing/under/bluespace/proc/bluespace_size(mob/usr as mob)
if (!ishuman(usr))
return
var/mob/living/carbon/human/H = usr
if (H.stat || H.restrained())
return
if (src != H.w_uniform)
to_chat(H,"<span class='warning'>You must be WEARING the uniform to change your size.</span>")
return
var/new_size = input("Put the desired size (25-200%)", "Set Size", 200) as num|null
//Check AGAIN because we accepted user input which is blocking.
if (src != H.w_uniform)
to_chat(H,"<span class='warning'>You must be WEARING the uniform to change your size.</span>")
return
if (H.stat || H.restrained())
return
if (isnull(H.size_multiplier))
to_chat(H,"<span class='warning'>The uniform panics and corrects your apparently microscopic size.</span>")
H.resize(RESIZE_NORMAL)
H.update_icons() //Just want the matrix transform
return
if (!ISINRANGE(new_size,25,200))
to_chat(H,"<span class='notice'>The safety features of the uniform prevent you from choosing this size.</span>")
return
else if(new_size)
if(new_size != H.size_multiplier)
if(!original_size)
original_size = H.size_multiplier
H.resize(new_size/100)
H.visible_message("<span class='warning'>The space around [H] distorts as they change size!</span>","<span class='notice'>The space around you distorts as you change size!</span>")
else //They chose their current size.
return
/obj/item/clothing/under/bluespace/mob_can_unequip(mob/M, slot, disable_warning = 0)
. = ..()
if(. && ishuman(M) && original_size)
var/mob/living/carbon/human/H = M
H.resize(original_size)
original_size = null
H.visible_message("<span class='warning'>The space around [H] distorts as they return to their original size!</span>","<span class='notice'>The space around you distorts as you return to your original size!</span>")
//Same as Nanotrasen Security Uniforms
/obj/item/clothing/under/ert
armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0)

408
code/modules/clothing/under/oricon.dm Normal file
View File

@@ -0,0 +1,408 @@
//Confederation Uniforms
//Master
/obj/item/clothing/under/oricon
name = "master oricon uniform"
desc = "You shouldn't be seeing this."
icon = 'icons/obj/clothing/uniforms_oricon.dmi'
rolled_down = 0
rolled_sleeves = 0
item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_oricon.dmi')
armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5)
siemens_coefficient = 0.8
//PT
/obj/item/clothing/under/oricon/pt
name = "pt uniform"
desc = "Shorts! Shirt! Miami! Sexy!"
icon_state = "miami"
worn_state = "miami"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/oricon/pt/sysguard
name = "\improper SysGuard pt uniform"
desc = "A baggy shirt bearing the seal of the System Defense Force and some dorky looking blue shorts."
icon_state = "expeditionpt"
worn_state = "expeditionpt"
/obj/item/clothing/under/oricon/pt/fleet
name = "fleet pt uniform"
desc = "A pair of black shorts and two tank tops, seems impractical. Looks good though."
icon_state = "fleetpt"
worn_state = "fleetpt"
/obj/item/clothing/under/oricon/pt/marine
name = "marine pt uniform"
desc = "Does NOT leave much to the imagination."
icon_state = "marinept"
worn_state = "marinept"
//Utility
//These are just colored
/obj/item/clothing/under/utility
name = "utility uniform"
desc = "A comfortable turtleneck and black utility trousers."
icon_state = "blackutility"
worn_state = "blackutility"
rolled_sleeves = 0
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/utility/blue
name = "utility uniform"
desc = "A comfortable blue utility jumpsuit."
icon_state = "navyutility"
worn_state = "navyutility"
/obj/item/clothing/under/utility/grey
name = "utility uniform"
desc = "A comfortable grey utility jumpsuit."
icon_state = "greyutility"
worn_state = "greyutility"
//Here's the real ones
/obj/item/clothing/under/oricon/utility/sysguard
name = "\improper SysGuard uniform"
desc = "The utility uniform of the System Defense Force, made from biohazard resistant material. This one has silver trim."
icon_state = "blackutility_crew"
worn_state = "blackutility_crew"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
/obj/item/clothing/under/oricon/utility/sysguard/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command)
/obj/item/clothing/under/oricon/utility/sysguard/engineering
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering)
/obj/item/clothing/under/oricon/utility/sysguard/security
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security)
/obj/item/clothing/under/oricon/utility/sysguard/medical
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical)
/obj/item/clothing/under/oricon/utility/sysguard/supply
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply)
/obj/item/clothing/under/oricon/utility/sysguard/exploration
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration)
/obj/item/clothing/under/oricon/utility/sysguard/research
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research)
/obj/item/clothing/under/oricon/utility/sysguard/officer
name = "\improper SysGuard officer's uniform"
desc = "The utility uniform of the System Defense Force, made from biohazard resistant material. This one has gold trim."
icon_state = "blackutility_com"
worn_state = "blackutility_com"
/obj/item/clothing/under/oricon/utility/sysguard/officer/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command)
/obj/item/clothing/under/oricon/utility/sysguard/officer/engineering
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering)
/obj/item/clothing/under/oricon/utility/sysguard/officer/security
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security)
/obj/item/clothing/under/oricon/utility/sysguard/officer/medical
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical)
/obj/item/clothing/under/oricon/utility/sysguard/officer/supply
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply)
/obj/item/clothing/under/oricon/utility/sysguard/officer/exploration
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration)
/obj/item/clothing/under/oricon/utility/sysguard/officer/research
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research)
/obj/item/clothing/under/oricon/utility/fleet
name = "fleet coveralls"
desc = "The utility uniform of the OCG Fleet, made from an insulated material."
icon_state = "navyutility"
worn_state = "navyutility"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
/obj/item/clothing/under/oricon/utility/fleet/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/fleet)
/obj/item/clothing/under/oricon/utility/fleet/command/pilot
starting_accessories = list(/obj/item/clothing/accessory/oricon/specialty/pilot)
/obj/item/clothing/under/oricon/utility/fleet/engineering
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/fleet)
/obj/item/clothing/under/oricon/utility/fleet/security
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/fleet)
/obj/item/clothing/under/oricon/utility/fleet/medical
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/fleet)
/obj/item/clothing/under/oricon/utility/fleet/supply
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/fleet)
/obj/item/clothing/under/oricon/utility/fleet/exploration
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/fleet)
/obj/item/clothing/under/oricon/utility/marine
name = "marine fatigues"
desc = "The utility uniform of the OCG Marine Corps, made from durable material."
icon_state = "greyutility"
worn_state = "greyutility"
armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/oricon/utility/marine/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/marine)
/obj/item/clothing/under/oricon/utility/marine/engineering
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/marine)
/obj/item/clothing/under/oricon/utility/marine/security
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/marine)
/obj/item/clothing/under/oricon/utility/marine/medical
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/marine)
/obj/item/clothing/under/oricon/utility/marine/supply
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/marine)
/obj/item/clothing/under/oricon/utility/marine/exploration
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/marine)
/obj/item/clothing/under/oricon/utility/marine/green
name = "green fatigues"
desc = "A green version of the OCG marine utility uniform, made from durable material."
icon_state = "greenutility"
worn_state = "greenutility"
/obj/item/clothing/under/oricon/utility/marine/tan
name = "tan fatigues"
desc = "A tan version of the OCG marine utility uniform, made from durable material."
icon_state = "tanutility"
worn_state = "tanutility"
//Service
/obj/item/clothing/under/oricon/service
name = "service uniform"
desc = "A service uniform of some kind."
icon_state = "whiteservice"
worn_state = "whiteservice"
armor = list(melee = 5, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 5, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/oricon/service/fleet
name = "fleet service uniform"
desc = "The service uniform of the OCG Fleet, made from immaculate white fabric."
icon_state = "whiteservice"
worn_state = "whiteservice"
/obj/item/clothing/under/oricon/service/marine
name = "marine service uniform"
desc = "The service uniform of the OCG Marine Corps. Slimming."
icon_state = "greenservice"
worn_state = "greenservice"
/obj/item/clothing/under/oricon/service/marine/command
name = "marine command service uniform"
desc = "The service uniform of the OCG Marine Corps. Slimming and stylish."
icon_state = "greenservice_com"
worn_state = "greenservice_com"
//Dress
/obj/item/clothing/under/oricon/mildress
name = "dress uniform"
desc = "A dress uniform of some kind."
icon_state = "greydress"
worn_state = "greydress"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/oricon/mildress/sysguard
name = "\improper SysGuard dress uniform"
desc = "The dress uniform of the System Defense Force in silver trim."
/obj/item/clothing/under/oricon/mildress/sysguard/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/service)
/obj/item/clothing/under/oricon/mildress/sysguard/engineering
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/service)
/obj/item/clothing/under/oricon/mildress/sysguard/security
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/service)
/obj/item/clothing/under/oricon/mildress/sysguard/medical
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/service)
/obj/item/clothing/under/oricon/mildress/sysguard/supply
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/service)
/obj/item/clothing/under/oricon/mildress/sysguard/service
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/service/service)
/obj/item/clothing/under/oricon/mildress/sysguard/exploration
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/service)
/obj/item/clothing/under/oricon/mildress/sysguard/research
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research/service)
/obj/item/clothing/under/oricon/mildress/sysguard/officer
name = "\improper SysGuard command dress uniform"
desc = "The dress uniform of the System Defense Force in gold trim."
icon_state = "greydress_com"
worn_state = "greydress_com"
/obj/item/clothing/under/oricon/mildress/sysguard/officer/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/service)
/obj/item/clothing/under/oricon/mildress/sysguard/officer/engineering
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/service)
/obj/item/clothing/under/oricon/mildress/sysguard/officer/security
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/service)
/obj/item/clothing/under/oricon/mildress/sysguard/officer/medical
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/service)
/obj/item/clothing/under/oricon/mildress/sysguard/officer/supply
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/service)
/obj/item/clothing/under/oricon/mildress/sysguard/officer/service
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/service/service)
/obj/item/clothing/under/oricon/mildress/sysguard/officer/exploration
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/service)
/obj/item/clothing/under/oricon/mildress/sysguard/officer/research
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research/service)
/obj/item/clothing/under/oricon/mildress/marine
name = "marine dress uniform"
desc = "The dress uniform of the OCG Marine Corps, class given form."
icon_state = "blackdress"
worn_state = "blackdress"
/obj/item/clothing/under/oricon/mildress/marine/command
name = "marine command dress uniform"
desc = "The dress uniform of the OCG Marine Corps, even classier in gold."
icon_state = "blackdress_com"
worn_state = "blackdress_com"
//Misc
/obj/item/clothing/under/hazard
name = "hazard jumpsuit"
desc = "A high visibility jumpsuit made from heat and radiation resistant materials."
icon_state = "hazard"
worn_state = "hazard"
siemens_coefficient = 0.8
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 20, bio = 0, rad = 20)
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
/obj/item/clothing/under/sterile
name = "sterile jumpsuit"
desc = "A sterile white jumpsuit with medical markings. Protects against all manner of biohazards."
icon_state = "sterile"
worn_state = "sterile"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 30, rad = 0)
//OriCon Uniforms
//PT
/obj/item/clothing/under/oricon/pt/sysguard
name = "explorer's pt uniform"
desc = "A baggy shirt bearing the seal of the Society of Universal Cartographers and some dorky looking blue shorts."
/obj/item/clothing/under/oricon/pt/fleet
name = "fleet pt uniform"
desc = "A pair of black shorts and two tank tops, seems impractical. Looks good though."
/obj/item/clothing/under/oricon/pt/marine
name = "marine pt uniform"
desc = "Does NOT leave much to the imagination."
//Utility
/obj/item/clothing/under/utility
name = "utility uniform"
desc = "A comfortable turtleneck and black utility trousers."
/obj/item/clothing/under/oricon/utility/sysguard
name = "explorer's uniform"
desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has silver trim."
/obj/item/clothing/under/oricon/utility/sysguard/officer
name = "explorer's officer uniform"
desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has gold trim."
/obj/item/clothing/under/oricon/utility/fleet
name = "fleet coveralls"
desc = "The utility uniform of the USDF Fleet, made from an insulated material."
/obj/item/clothing/under/oricon/utility/marine
name = "marine fatigues"
desc = "The utility uniform of the USDF Marine Corps, made from durable material."
/obj/item/clothing/under/oricon/utility/marine/green
name = "green fatigues"
desc = "A green version of the USDF marine utility uniform, made from durable material."
/obj/item/clothing/under/oricon/utility/marine/tan
name = "tan fatigues"
desc = "A tan version of the USDF marine utility uniform, made from durable material."
/obj/item/clothing/under/oricon/utility/marine/olive
name = "olive fatigues"
desc = "An olive version of the USDF marine utility uniform, made from durable material."
icon = 'icons/obj/clothing/uniforms_vr.dmi'
icon_override = 'icons/mob/uniform_vr.dmi'
icon_state = "bdu_olive"
item_state = "bdu_olive"
/obj/item/clothing/under/oricon/utility/marine/desert
name = "desert fatigues"
desc = "A desert version of the USDF marine utility uniform, made from durable material."
icon = 'icons/obj/clothing/uniforms_vr.dmi'
icon_override = 'icons/mob/uniform_vr.dmi'
icon_state = "bdu_olive"
item_state = "bdu_olive"
//Service
/obj/item/clothing/under/oricon/service/fleet
name = "fleet service uniform"
desc = "The service uniform of the USDF Fleet, made from immaculate white fabric."
/obj/item/clothing/under/oricon/service/marine
name = "marine service uniform"
desc = "The service uniform of the USDF Marine Corps. Slimming."
worn_state = "greenservice"
/obj/item/clothing/under/oricon/service/marine/command
name = "marine command service uniform"
desc = "The service uniform of the USDF Marine Corps. Slimming and stylish."
/obj/item/clothing/under/oricon/mildress/expeditionary
name = "explorer's dress uniform"
desc = "The dress uniform of the Society of Universal Cartographers in silver trim."
/obj/item/clothing/under/oricon/mildress/expeditionary/command
name = "explorer's command dress uniform"
desc = "The dress uniform of the Society of Universal Cartographers in gold trim."
/obj/item/clothing/under/oricon/mildress/marine
name = "marine dress uniform"
desc = "The dress uniform of the USDF Marine Corps, class given form."
/obj/item/clothing/under/oricon/mildress/marine/command
name = "marine command dress uniform"
desc = "The dress uniform of the USDF Marine Corps, even classier in gold."

79
code/modules/clothing/under/oricon_cit.dm Normal file
View File

@@ -0,0 +1,79 @@
/obj/item/clothing/under/oricon/utility/sysguard/crew
name = "crew uniform"
desc = "A comfortable turtleneck and black utility trousers, made from biohazard resistant material. This one has silver trim."
/obj/item/clothing/under/oricon/utility/sysguard/crew/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/crew)
/obj/item/clothing/under/oricon/utility/sysguard/crew/engineering
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/crew)
/obj/item/clothing/under/oricon/utility/sysguard/crew/security
desc = "A comfortable turtleneck and black utility trousers, made from a slightly sturdy, biohazard resistant material. This one has silver trim."
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
siemens_coefficient = 0.9
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/crew)
/obj/item/clothing/under/oricon/utility/sysguard/crew/medical
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/crew)
/obj/item/clothing/under/oricon/utility/sysguard/crew/supply
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/crew)
/obj/item/clothing/under/oricon/utility/sysguard/crew/exploration
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/crew)
/obj/item/clothing/under/oricon/utility/sysguard/crew/research
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research/crew)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew
name = "command crew uniform"
desc = "A comfortable turtleneck and black utility trousers, made from biohazard resistant material. This one has gold trim."
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/command
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/command/crew)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/engineering
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/engineering/crew)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/security
desc = "A comfortable turtleneck and black utility trousers, made from a slightly sturdy, biohazard resistant material. This one has gold trim."
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
siemens_coefficient = 0.9
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/security/crew)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/medical
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/medical/crew)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/supply
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/supply/crew)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/exploration
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/exploration/crew)
/obj/item/clothing/under/oricon/utility/sysguard/officer/crew/research
starting_accessories = list(/obj/item/clothing/accessory/oricon/department/research/crew)
/obj/item/clothing/accessory/oricon/department/command/crew
desc = "An insignia denoting assignment to the command department. These fit crew uniforms."
/obj/item/clothing/accessory/oricon/department/engineering/crew
desc = "An insignia denoting assignment to the engineering department. These fit crew uniforms."
/obj/item/clothing/accessory/oricon/department/security/crew
desc = "An insignia denoting assignment to the security department. These fit crew uniforms."
/obj/item/clothing/accessory/oricon/department/medical/crew
desc = "An insignia denoting assignment to the medical department. These fit crew uniforms."
/obj/item/clothing/accessory/oricon/department/supply/crew
desc = "An insignia denoting assignment to the supply department. These fit crew uniforms."
/obj/item/clothing/accessory/oricon/department/exploration/crew
desc = "An insignia denoting assignment to the exploration department. These fit crew uniforms."
/obj/item/clothing/accessory/oricon/department/research/crew
desc = "An insignia denoting assignment to the research department. These fit crew uniforms."
/obj/item/clothing/accessory/oricon/department/service/crew
desc = "An insignia denoting assignment to the service department. These fit crew uniforms."

315
code/modules/clothing/under/solgov.dm
View File

@@ -1,315 +0,0 @@
//SolGov Uniforms
//Master
/obj/item/clothing/under/solgov
name = "master solgov uniform"
desc = "You shouldn't be seeing this."
icon = 'icons/obj/clothing/uniforms_solgov.dmi'
rolled_down = 0
rolled_sleeves = 0
item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi')
armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5)
siemens_coefficient = 0.8
//PT
/obj/item/clothing/under/solgov/pt
name = "pt uniform"
desc = "Shorts! Shirt! Miami! Sexy!"
icon_state = "miami"
worn_state = "miami"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/solgov/pt/sifguard
name = "\improper SifGuard pt uniform"
desc = "A baggy shirt bearing the seal of the Sif Defense Force and some dorky looking blue shorts."
icon_state = "expeditionpt"
worn_state = "expeditionpt"
/obj/item/clothing/under/solgov/pt/fleet
name = "fleet pt uniform"
desc = "A pair of black shorts and two tank tops, seems impractical. Looks good though."
icon_state = "fleetpt"
worn_state = "fleetpt"
/obj/item/clothing/under/solgov/pt/marine
name = "marine pt uniform"
desc = "Does NOT leave much to the imagination."
icon_state = "marinept"
worn_state = "marinept"
//Utility
//These are just colored
/obj/item/clothing/under/utility
name = "utility uniform"
desc = "A comfortable turtleneck and black utility trousers."
icon_state = "blackutility"
worn_state = "blackutility"
rolled_sleeves = 0
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/utility/blue
name = "utility uniform"
desc = "A comfortable blue utility jumpsuit."
icon_state = "navyutility"
worn_state = "navyutility"
/obj/item/clothing/under/utility/grey
name = "utility uniform"
desc = "A comfortable grey utility jumpsuit."
icon_state = "greyutility"
worn_state = "greyutility"
//Here's the real ones
/obj/item/clothing/under/solgov/utility/sifguard
name = "\improper SifGuard uniform"
desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has silver trim."
icon_state = "blackutility_crew"
worn_state = "blackutility_crew"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
/obj/item/clothing/under/solgov/utility/sifguard/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command)
/obj/item/clothing/under/solgov/utility/sifguard/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering)
/obj/item/clothing/under/solgov/utility/sifguard/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security)
/obj/item/clothing/under/solgov/utility/sifguard/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical)
/obj/item/clothing/under/solgov/utility/sifguard/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply)
/obj/item/clothing/under/solgov/utility/sifguard/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration)
/obj/item/clothing/under/solgov/utility/sifguard/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research)
/obj/item/clothing/under/solgov/utility/sifguard/officer
name = "\improper SifGuard officer's uniform"
desc = "The utility uniform of the Sif Defense Force, made from biohazard resistant material. This one has gold trim."
icon_state = "blackutility_com"
worn_state = "blackutility_com"
/obj/item/clothing/under/solgov/utility/sifguard/officer/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command)
/obj/item/clothing/under/solgov/utility/sifguard/officer/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering)
/obj/item/clothing/under/solgov/utility/sifguard/officer/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security)
/obj/item/clothing/under/solgov/utility/sifguard/officer/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical)
/obj/item/clothing/under/solgov/utility/sifguard/officer/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply)
/obj/item/clothing/under/solgov/utility/sifguard/officer/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration)
/obj/item/clothing/under/solgov/utility/sifguard/officer/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research)
/obj/item/clothing/under/solgov/utility/fleet
name = "fleet coveralls"
desc = "The utility uniform of the SCG Fleet, made from an insulated material."
icon_state = "navyutility"
worn_state = "navyutility"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
/obj/item/clothing/under/solgov/utility/fleet/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/fleet)
/obj/item/clothing/under/solgov/utility/fleet/command/pilot
starting_accessories = list(/obj/item/clothing/accessory/solgov/specialty/pilot)
/obj/item/clothing/under/solgov/utility/fleet/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/fleet)
/obj/item/clothing/under/solgov/utility/fleet/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/fleet)
/obj/item/clothing/under/solgov/utility/fleet/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet)
/obj/item/clothing/under/solgov/utility/fleet/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/fleet)
/obj/item/clothing/under/solgov/utility/fleet/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/fleet)
/obj/item/clothing/under/solgov/utility/marine
name = "marine fatigues"
desc = "The utility uniform of the SCG Marine Corps, made from durable material."
icon_state = "greyutility"
worn_state = "greyutility"
armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/solgov/utility/marine/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/marine)
/obj/item/clothing/under/solgov/utility/marine/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/marine)
/obj/item/clothing/under/solgov/utility/marine/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/marine)
/obj/item/clothing/under/solgov/utility/marine/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/marine)
/obj/item/clothing/under/solgov/utility/marine/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/marine)
/obj/item/clothing/under/solgov/utility/marine/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/marine)
/obj/item/clothing/under/solgov/utility/marine/green
name = "green fatigues"
desc = "A green version of the SCG marine utility uniform, made from durable material."
icon_state = "greenutility"
worn_state = "greenutility"
/obj/item/clothing/under/solgov/utility/marine/tan
name = "tan fatigues"
desc = "A tan version of the SCG marine utility uniform, made from durable material."
icon_state = "tanutility"
worn_state = "tanutility"
//Service
/obj/item/clothing/under/solgov/service
name = "service uniform"
desc = "A service uniform of some kind."
icon_state = "whiteservice"
worn_state = "whiteservice"
armor = list(melee = 5, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 5, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/solgov/service/fleet
name = "fleet service uniform"
desc = "The service uniform of the SCG Fleet, made from immaculate white fabric."
icon_state = "whiteservice"
worn_state = "whiteservice"
/obj/item/clothing/under/solgov/service/marine
name = "marine service uniform"
desc = "The service uniform of the SCG Marine Corps. Slimming."
icon_state = "greenservice"
worn_state = "greenservice"
/obj/item/clothing/under/solgov/service/marine/command
name = "marine command service uniform"
desc = "The service uniform of the SCG Marine Corps. Slimming and stylish."
icon_state = "greenservice_com"
worn_state = "greenservice_com"
//Dress
/obj/item/clothing/under/solgov/mildress
name = "dress uniform"
desc = "A dress uniform of some kind."
icon_state = "greydress"
worn_state = "greydress"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
/obj/item/clothing/under/solgov/mildress/sifguard
name = "\improper SifGuard dress uniform"
desc = "The dress uniform of the Sif Defense Force in silver trim."
/obj/item/clothing/under/solgov/mildress/sifguard/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/service)
/obj/item/clothing/under/solgov/mildress/sifguard/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/service)
/obj/item/clothing/under/solgov/mildress/sifguard/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/service)
/obj/item/clothing/under/solgov/mildress/sifguard/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/service)
/obj/item/clothing/under/solgov/mildress/sifguard/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/service)
/obj/item/clothing/under/solgov/mildress/sifguard/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/service)
/obj/item/clothing/under/solgov/mildress/sifguard/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/service)
/obj/item/clothing/under/solgov/mildress/sifguard/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer
name = "\improper SifGuard command dress uniform"
desc = "The dress uniform of the Sif Defense Force in gold trim."
icon_state = "greydress_com"
worn_state = "greydress_com"
/obj/item/clothing/under/solgov/mildress/sifguard/officer/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/security
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/service
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/service)
/obj/item/clothing/under/solgov/mildress/sifguard/officer/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/service)
/obj/item/clothing/under/solgov/mildress/marine
name = "marine dress uniform"
desc = "The dress uniform of the SCG Marine Corps, class given form."
icon_state = "blackdress"
worn_state = "blackdress"
/obj/item/clothing/under/solgov/mildress/marine/command
name = "marine command dress uniform"
desc = "The dress uniform of the SCG Marine Corps, even classier in gold."
icon_state = "blackdress_com"
worn_state = "blackdress_com"
//Misc
/obj/item/clothing/under/hazard
name = "hazard jumpsuit"
desc = "A high visibility jumpsuit made from heat and radiation resistant materials."
icon_state = "hazard"
worn_state = "hazard"
siemens_coefficient = 0.8
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 20, bio = 0, rad = 20)
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
/obj/item/clothing/under/sterile
name = "sterile jumpsuit"
desc = "A sterile white jumpsuit with medical markings. Protects against all manner of biohazards."
icon_state = "sterile"
worn_state = "sterile"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 30, rad = 0)

79
code/modules/clothing/under/solgov_cit.dm
View File

@@ -1,79 +0,0 @@
/obj/item/clothing/under/solgov/utility/sifguard/crew
name = "crew uniform"
desc = "A comfortable turtleneck and black utility trousers, made from biohazard resistant material. This one has silver trim."
/obj/item/clothing/under/solgov/utility/sifguard/crew/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/crew)
/obj/item/clothing/under/solgov/utility/sifguard/crew/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/crew)
/obj/item/clothing/under/solgov/utility/sifguard/crew/security
desc = "A comfortable turtleneck and black utility trousers, made from a slightly sturdy, biohazard resistant material. This one has silver trim."
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
siemens_coefficient = 0.9
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/crew)
/obj/item/clothing/under/solgov/utility/sifguard/crew/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/crew)
/obj/item/clothing/under/solgov/utility/sifguard/crew/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/crew)
/obj/item/clothing/under/solgov/utility/sifguard/crew/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/crew)
/obj/item/clothing/under/solgov/utility/sifguard/crew/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/crew)
/obj/item/clothing/under/solgov/utility/sifguard/officer/crew
name = "command crew uniform"
desc = "A comfortable turtleneck and black utility trousers, made from biohazard resistant material. This one has gold trim."
/obj/item/clothing/under/solgov/utility/sifguard/officer/crew/command
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/crew)
/obj/item/clothing/under/solgov/utility/sifguard/officer/crew/engineering
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/crew)
/obj/item/clothing/under/solgov/utility/sifguard/officer/crew/security
desc = "A comfortable turtleneck and black utility trousers, made from a slightly sturdy, biohazard resistant material. This one has gold trim."
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10)
siemens_coefficient = 0.9
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/crew)
/obj/item/clothing/under/solgov/utility/sifguard/officer/crew/medical
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/crew)
/obj/item/clothing/under/solgov/utility/sifguard/officer/crew/supply
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/crew)
/obj/item/clothing/under/solgov/utility/sifguard/officer/crew/exploration
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/crew)
/obj/item/clothing/under/solgov/utility/sifguard/officer/crew/research
starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/crew)
/obj/item/clothing/accessory/solgov/department/command/crew
desc = "An insignia denoting assignment to the command department. These fit crew uniforms."
/obj/item/clothing/accessory/solgov/department/engineering/crew
desc = "An insignia denoting assignment to the engineering department. These fit crew uniforms."
/obj/item/clothing/accessory/solgov/department/security/crew
desc = "An insignia denoting assignment to the security department. These fit crew uniforms."
/obj/item/clothing/accessory/solgov/department/medical/crew
desc = "An insignia denoting assignment to the medical department. These fit crew uniforms."
/obj/item/clothing/accessory/solgov/department/supply/crew
desc = "An insignia denoting assignment to the supply department. These fit crew uniforms."
/obj/item/clothing/accessory/solgov/department/exploration/crew
desc = "An insignia denoting assignment to the exploration department. These fit crew uniforms."
/obj/item/clothing/accessory/solgov/department/research/crew
desc = "An insignia denoting assignment to the research department. These fit crew uniforms."
/obj/item/clothing/accessory/solgov/department/service/crew
desc = "An insignia denoting assignment to the service department. These fit crew uniforms."

92
code/modules/clothing/under/solgov_vr.dm
View File

@@ -1,92 +0,0 @@
//SolGov Uniforms
//PT
/obj/item/clothing/under/solgov/pt/sifguard
name = "explorer's pt uniform"
desc = "A baggy shirt bearing the seal of the Society of Universal Cartographers and some dorky looking blue shorts."
/obj/item/clothing/under/solgov/pt/fleet
name = "fleet pt uniform"
desc = "A pair of black shorts and two tank tops, seems impractical. Looks good though."
/obj/item/clothing/under/solgov/pt/marine
name = "marine pt uniform"
desc = "Does NOT leave much to the imagination."
//Utility
/obj/item/clothing/under/utility
name = "utility uniform"
desc = "A comfortable turtleneck and black utility trousers."
/obj/item/clothing/under/solgov/utility/sifguard
name = "explorer's uniform"
desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has silver trim."
/obj/item/clothing/under/solgov/utility/sifguard/officer
name = "explorer's officer uniform"
desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This one has gold trim."
/obj/item/clothing/under/solgov/utility/fleet
name = "fleet coveralls"
desc = "The utility uniform of the USDF Fleet, made from an insulated material."
/obj/item/clothing/under/solgov/utility/marine
name = "marine fatigues"
desc = "The utility uniform of the USDF Marine Corps, made from durable material."
/obj/item/clothing/under/solgov/utility/marine/green
name = "green fatigues"
desc = "A green version of the USDF marine utility uniform, made from durable material."
/obj/item/clothing/under/solgov/utility/marine/tan
name = "tan fatigues"
desc = "A tan version of the USDF marine utility uniform, made from durable material."
/obj/item/clothing/under/solgov/utility/marine/olive
name = "olive fatigues"
desc = "An olive version of the USDF marine utility uniform, made from durable material."
icon = 'icons/obj/clothing/uniforms_vr.dmi'
icon_override = 'icons/mob/uniform_vr.dmi'
icon_state = "bdu_olive"
item_state = "bdu_olive"
/obj/item/clothing/under/solgov/utility/marine/desert
name = "desert fatigues"
desc = "A desert version of the USDF marine utility uniform, made from durable material."
icon = 'icons/obj/clothing/uniforms_vr.dmi'
icon_override = 'icons/mob/uniform_vr.dmi'
icon_state = "bdu_olive"
item_state = "bdu_olive"
//Service
/obj/item/clothing/under/solgov/service/fleet
name = "fleet service uniform"
desc = "The service uniform of the USDF Fleet, made from immaculate white fabric."
/obj/item/clothing/under/solgov/service/marine
name = "marine service uniform"
desc = "The service uniform of the USDF Marine Corps. Slimming."
worn_state = "greenservice"
/obj/item/clothing/under/solgov/service/marine/command
name = "marine command service uniform"
desc = "The service uniform of the USDF Marine Corps. Slimming and stylish."
/obj/item/clothing/under/solgov/mildress/expeditionary
name = "explorer's dress uniform"
desc = "The dress uniform of the Society of Universal Cartographers in silver trim."
/obj/item/clothing/under/solgov/mildress/expeditionary/command
name = "explorer's command dress uniform"
desc = "The dress uniform of the Society of Universal Cartographers in gold trim."
/obj/item/clothing/under/solgov/mildress/marine
name = "marine dress uniform"
desc = "The dress uniform of the USDF Marine Corps, class given form."
/obj/item/clothing/under/solgov/mildress/marine/command
name = "marine command dress uniform"
desc = "The dress uniform of the USDF Marine Corps, even classier in gold."

4
code/modules/economy/TradeDestinations.dm
View File

@@ -19,7 +19,7 @@ var/list/weighted_mundaneevent_locations = list()
//distance is measured in Arbitrary and corelates to travel time, like, I guess
/datum/trade_destination/luna
name = "Luna"
description = "The capital world of SolGov, host to NanoTrasen's corporate offices."
description = "The capital world of the Orion Confederatoin, the primary Human government."
distance = 1.2
willing_to_buy = list()
willing_to_sell = list()
@@ -82,7 +82,7 @@ var/list/weighted_mundaneevent_locations = list()
/datum/trade_destination/abelsrest
name = "Abel's Rest"
description = "A garden world on the Hegemony border. Coinhabitated rather uncomfortably by Unathi and Solar settlers."
description = "A garden world on the Hegemony border. Coinhabitated rather uncomfortably by Unathi and Orion settlers."
distance = 7.5
willing_to_buy = list()
willing_to_sell = list()

28
code/modules/economy/lorenews.dm
View File

@@ -17,7 +17,7 @@
var/list/weird = list("Silk", "Nyx") //no region
//by government
var/list/solgov = crescent + core + heights + bowl + crypt + weird
var/list/oricon = crescent + core + heights + bowl + crypt + weird
var/list/skrell = list("Qerr'Vallis", "Qerma-Lakirr", "Harrqak", "Kauq'xum")
var/list/skrellfar = list("The Far Kingdom of Light and Shifting Shadow")// more colonies Elgeon
var/list/unathi = list("Moghes", "Qerrna-Qamxea", "Abel's Rest") // more colonies Anewbe
@@ -26,7 +26,7 @@
//this is what you should pick for most applications
//whether or not the rim goes there is something that should be changed per the metaplot
var/list/loc = solgov + skrell + tajara
var/list/loc = oricon + skrell + tajara
//this includes systems Sol doesn't really have eyes on
var/list/allloc = loc + unathi + skrellfar + independent + rim
@@ -63,15 +63,15 @@
var/body = pick("A high-ranking Vey-Med executive was revealed to have been experimenting on biological neural enhancement techniques, believed to be of Skrellian origin, which could lead to the production of transhuman entities with an average cognitive capacity 30% greater than a baseline human.",
"[random_name(MALE)], chairman of the controversial Friends of Ned party, is scheduled to speak at a prominant university in [pick(core)] this Monday, according to a statement on his official newsfeed.",
"A wing of Ward-Takahashi B-class drones became catatonic this Thursday after tripping late-stage anti-emergence protocols. W-T Chief of Development has declined to comment.",
"A brand-new shipment of recreational voidcraft has been deemed \"Unsafe for use\" and seized at [pick(solgov)] customs. Wulf Aeronautics blames error in automated manufactory on [pick(solgov)], assures shareholders of \"One time incident\" after shares drop 4%.",
"Activity in a mostly automated Xion work-site in [pick(solgov)] has been suspended indefinitely, after reports of atypical drone behavior. The EIO's assigned investigator commented on the shutdown, saying \"We'll get them up and running again as soon as we're sure it's safe.\" No comment so far on an estimated time or date of reopening.",
"The EIO has officially raised the Emergence Threat Level in [pick(solgov)] to Blue. Citizens are reminded to comply with all EIO Agent requests. Failure to do so will be met with legal action, up to and including imprisonment.",
"All SolGov citizens beware, the scourge know as the Vox have increased the frequency of their attacks on isolated and poorly defended SolGov territories in [pick(bowl)]. Citizens have been advised to travel in groups and remain aware of their surroundings at all times.",
"The Unathi have recently moved a large amount of material into Abel's Rest, under the premise of building additional power plants. According to our sources, the material is in fact being channeled into domestic terrorist groups on both sides, in an attempt to incite a SolGov response. More news as the story develops.",
"A brand-new shipment of recreational voidcraft has been deemed \"Unsafe for use\" and seized at [pick(oricon)] customs. Wulf Aeronautics blames error in automated manufactory on [pick(oricon)], assures shareholders of \"One time incident\" after shares drop 4%.",
"Activity in a mostly automated Xion work-site in [pick(oricon)] has been suspended indefinitely, after reports of atypical drone behavior. The EIO's assigned investigator commented on the shutdown, saying \"We'll get them up and running again as soon as we're sure it's safe.\" No comment so far on an estimated time or date of reopening.",
"The EIO has officially raised the Emergence Threat Level in [pick(oricon)] to Blue. Citizens are reminded to comply with all EIO Agent requests. Failure to do so will be met with legal action, up to and including imprisonment.",
"All OriCon citizens beware, the scourge know as the Vox have increased the frequency of their attacks on isolated and poorly defended OriCon territories in [pick(bowl)]. Citizens have been advised to travel in groups and remain aware of their surroundings at all times.",
"The Unathi have recently moved a large amount of material into Abel's Rest, under the premise of building additional power plants. According to our sources, the material is in fact being channeled into domestic terrorist groups on both sides, in an attempt to incite a OriCon response. More news as the story develops.",
"Controversial Kishari director [random_name(FEMALE)] announced this Friday a sequel to the 2525 animated series Soldiers of the Yearlong War. Open auditions for supporting cast members have been called.",
"Amid concerns that it promotes a pro-transtech agenda, a high-profile screening of the award-winning animated film \"The Inventor's Marvelous Mechanical Maidens\" was canceled today on [pick(pick(core, heights))].",
"A radiation leak caused by a power unit rupture at a [pick(solgov)] hazardous materials reclamation plant has left several workers and neighboring residents with acute radiation poisoning. Witnesses report that a basic lifting drone failed to recognize and collided with the misplaced unit.",
"Xenophobic fringe group Humanity First has claimed credit for a bombing at a local government office on [pick(solgov)] which left three seriously injured. Police report that they have two suspects in custody, but details remain sparse.",
"A radiation leak caused by a power unit rupture at a [pick(oricon)] hazardous materials reclamation plant has left several workers and neighboring residents with acute radiation poisoning. Witnesses report that a basic lifting drone failed to recognize and collided with the misplaced unit.",
"Xenophobic fringe group Humanity First has claimed credit for a bombing at a local government office on [pick(oricon)] which left three seriously injured. Police report that they have two suspects in custody, but details remain sparse.",
"Government official [random_name(MALE)] reports that the crew of the [pick(prefixes)] [pick(ship_names)], the vessel boarded by Jaguar Gang pirates earlier this week, are \"Safe, unharmed, and happy to be back at work.\" Officials were unable to comment on future security measures at this time.",
"Sanitation Technician [random_name(FEMALE)] says she was trapped in her work bathroom for three days after the locking system went haywire! The furious techie says she wants a \"hefty sum\" from her employers and that she won't be visiting that cubicle again any time soon!",
"Experts at a top university have said that almost every position in modern society might be filled by a robot within the next few decades if production continues at its current rate. Workers' Rights groups have expressed alarm at the news, and have called for protections against the \"Tin menace\".",
@@ -84,7 +84,7 @@
"Gas mask toting Revolutionary Solar People's Party extremists have reportedly attacked police at a rally in [pick(crypt)]. Peace-keeping officers were viscously pelted with objects and several protesters were found to be equipped with bottles containing an \"unknown substance.\"",
"Be careful what you say around your personal AI device as you never know who might be listening, say top minds! Cybercrime expert [random_name(FEMALE)] says hackers can easily trick your device to listen in on your conversations, record you in secret, or even steal your identity!",
"Thousands of travellers have been stranded at [pick(loc)] spaceport as a major error with the artificial intelligence system purged weeks worth of scheduling and manifest data from the port's mainframe. Major Bill's Transportation is offering stranded passengers 20% off replacement flights.",
"An outraged pet owner claims that a cybernetic company in [pick(solgov)] performed \"disturbing\" surgeries on their beloved cat, Pickles. [random_name(PLURAL)], 58 claims that the local cybernetics firm stole the furry friend from the vet's office and \"Replaced his brain with ones and zeroes.\"",
"An outraged pet owner claims that a cybernetic company in [pick(oricon)] performed \"disturbing\" surgeries on their beloved cat, Pickles. [random_name(PLURAL)], 58 claims that the local cybernetics firm stole the furry friend from the vet's office and \"Replaced his brain with ones and zeroes.\"",
"Doctors in [pick(pick(skrell, heights))] were left in awe and horror as a Teshari was hatched with the features of an adult human man! Sources say that the youngster hatched with a full head of hair and could recite six nursery rhymes from memory. Could Skrell genetic experiments be to blame?",
"Miners in [pick(bowl)] were dismayed to discover that their boss was actually a C-class drone intelligence! \"I should've known there was something wrong,\" says dumbfounded miner [random_name(MALE)],\"I'd say good morning and he'd just start listing off mineral densities and coordinates. I just thought he loved his job a little too much.\"",
"The remains of an early 22nd century voidcraft containing \"Period artifacts, technology and human remains\" has been located on the surface of Luna after centuries of being disregarded as worthless wreck. Historians hope the find will provide insight into daily life under the short-lived Selene Federation.",
@@ -95,15 +95,15 @@
"Representatives report that investigations continue on a string of fires on [pick("Nisp", "Binma", "Sif", "Kishar", "Abel's Rest", "Merelar")]. While no information has been released to the public, authorities assure the press that they are doing everything in their power to find those responsible.",
"En-route to the contentious rim system, a medical aid mission to Natuna was stopped by Ue-Katish pirates masquerading as refugees, who boarded the ship and stripped it of all supplies.",
"Lead Singer of Strawberry Idol Revealed As Three Teshari In A Trench Coat-- Newest gimmick or shocking revelation??",
"Shocking art critics throughout the system, a recent submission to the [pick(solgov)] Museum of Absurdism's contemporary exhibit was revealed to actually be the nutritional information on the back of a dehydrated cereal product common in Skrell space.",
"Shocking art critics throughout the system, a recent submission to the [pick(oricon)] Museum of Absurdism's contemporary exhibit was revealed to actually be the nutritional information on the back of a dehydrated cereal product common in Skrell space.",
"The celebrated magical kid series \"Petit Yuusha Jossen Temonila\" has announced its newest season at the height of its demicentenial festival. Noted director [random_name(MALE)] has promised to bring a diverse production staff to the venerable series, and has stated a theme of \"the friendships that transcend borders\".",
"The Hephaestus Industries board of directors announced this Monday the highest annual profits since the height of the Lizard Riots.",
"A radical group of Mercurials were convicted today of violations of Five Points legislature at an extraordinary court on [pick(solgov)]. These convictions come at the heels of a successful sting operation six years in the making, lead by local Head of EIO [random_name(FEMALE)].",
"A radical group of Mercurials were convicted today of violations of Five Points legislature at an extraordinary court on [pick(oricon)]. These convictions come at the heels of a successful sting operation six years in the making, lead by local Head of EIO [random_name(FEMALE)].",
"An unnamed official of the shipping TSC Major Bill's Transportation narrowly escaped an attempt on their life by a deranged assassin. The assassin claims to have been driven to this henious act by the corporation's infamous jingle.",
"In the aftermath of yesterday's synthphobic rally on [pick(solgov)], three positronic citizens were left irreparably damaged by a hostile mob, who claim that the victims were \"AAs\" attempting to infiltrate the rally.",
"In the aftermath of yesterday's synthphobic rally on [pick(oricon)], three positronic citizens were left irreparably damaged by a hostile mob, who claim that the victims were \"AAs\" attempting to infiltrate the rally.",
"EIO spokesperson [random_name(MALE)] stated in a press conference yesterday that the \"Shakespear\" A-class codeline was briefly available for download on the darknet, although they claim to be \"confident that the leak was shut down before any significant portion could be downloaded\". Experts suspect Association involvement.",
"[pick("Strives Towards", "Embraces", "Dreams of", "Cultivates", "Advocates", "Exemplifies")] [pick("Strength", "Wisdom", "Independence", "Pragmatism", "Reason", "Development")], a Community Child from Angessa's Pearl, published his memoir today, detailing a shocking level of abuse by caretakers and educators.",
"Nova Sixty, Mercurial web personality, claims that the disappearence of the SCG-R Song Shi was a plot by \"extradimensional rockmen\" who intend to sow mistrust between the Association and SolGov. Quote Sixty, \"The Far Kingdoms' attempt to hide the TRUTH only proves that they and their rockman allies are NOT to be trusted.\"",
"Nova Sixty, Mercurial web personality, claims that the disappearence of the SCG-R Song Shi was a plot by \"extradimensional rockmen\" who intend to sow mistrust between the Association and OriCon. Quote Sixty, \"The Far Kingdoms' attempt to hide the TRUTH only proves that they and their rockman allies are NOT to be trusted.\"",
"Unusual stellar phenomena was detected on [pick(allloc)], sparking concerns about the colonies in the system.",
)

2
code/modules/examine/descriptions/containers.dm
View File

@@ -8,7 +8,7 @@
description_fluff = "This cola was allegedly made after Vasily Federov, the son of Nikolas Federov and the second CEO of Federov Beverages Inc., went on a climbing expedition to an arctic planet. He then created this citris flavored soft drink. Scientists claim that it can eat through styrafoam in a matter of weeks, but people drink it anyway."
/obj/item/reagent_containers/food/drinks/cans/thirteenloko
description_fluff = "A beverage loved by college students. The Thirteen Loko Company created this highly alcoholic beverage as an energy drink. It is illegal in much of SolGov space and most of Skrell space. This drink has been regulated more than any other in known space, and doctors strongly advise not to drink it."
description_fluff = "A beverage loved by college students. The Thirteen Loko Company created this highly alcoholic beverage as an energy drink. It is illegal in much of OriCon and Skrell space. This drink has been regulated more than any other in known space, and doctors strongly advise not to drink it."
/obj/item/reagent_containers/food/drinks/cans/dr_gibb
description_fluff = "Originally made by a doctor seeking to mix several different flavors, this soda has become widely popular in the past decade. The drink has become so popular, in fact, that Nikolas Beverages bought it. Ever since then, the drink has never been the same. As a result, people all across known space beg for the old formula, but Nikolas Beverages does not appear to be listening."

20
code/modules/examine/descriptions/food.dm
View File

@@ -15,36 +15,36 @@
/obj/item/reagent_containers/food/snacks/donkpocket
description_fluff = "DONKpockets were originally a Nanotrasen product, an attempt to break into the food market controlled by Centauri Provisions. Somehow, Centauri wound up with the rights to the DONK brand, ending Nanotrasen's ambitions. They taste pretty okay."
/obj/item/reagent_containers/food/snacks/pie
description_fluff = "One of the more esoteric terms of the Nanotrasen-Centauri Noncompetition Agreement of 2545 was a requirement that Nanotrasen stock these pies on all their stations. They're calibrated for commedic value, not taste."
/obj/item/reagent_containers/food/snacks/sosjerky
description_fluff = "Space Cows, here, being an affectionate name given by early colonists to the massive food synthesizers used to sustain independent outposts before the dominance of hydroponics. Tastes like cardboard rubbed in meat seasoning."
/obj/item/reagent_containers/food/snacks/no_raisin
description_fluff = "Originally Raisin Blend no. 4, 4noraisins obtained their current name in the Skadi Positronic Exclusion Crisis of 2442, where they were rebranded as part of the protests." //the exclusion crisis, presumably, involved positronic immigration being banned for no raisin
/obj/item/reagent_containers/food/snacks/spacetwinkie
description_fluff = "Space Twinkies, a modification of a flagship product of one of Centauri Provision's predecessor corporations, are designed to withstand vacuum, radiation, dehydration, and long periods of acceleration without losing their shape or taste. They're not great, but they have earned their names (and enormous revenue for their parent company)."
/obj/item/reagent_containers/food/snacks/cheesiehonkers
description_fluff = "Cheesie Honkers, a previously niche line of cheese puffs from a subsidiary of a subsidiary of Centauri Provisions, rose to household-name status when their tell-tale orange dust was used as evidence to convict notorious positronic serial killer Etoid in 2404."
/obj/item/reagent_containers/food/snacks/syndicake
description_fluff = "Due to ongoing litigation concerning the business practices of the Cakemakers' Syndicate, access to this product has been removed from all Centauri and Getmore vending machines. This is a shame, because Syndi-Cakes are generally regarded as the most appetizing thing in them."
/obj/item/reagent_containers/food/snacks/twobread
description_fluff = "The most popular recipe from the Morpheus Cyberkinetics cookbook 'Calories for Organics'"
/obj/item/reagent_containers/food/snacks/liquidfood
description_fluff = "A survival food commonly packed onto short-distance bluespace shuttles and similar vessels. Tastes like chalk, but is packed full of nutrients and will keep you alive."
/obj/item/reagent_containers/food/snacks/tastybread
description_fluff = "This is the product that brought Centauri Provisions into the limelight. A product of the earliest extrasolar colony of Heaven, the Bread Tube, while bland, contains all the nutrients a spacer needs to get through the day and is decidedly edible when compared to some of its competitors."
/obj/item/reagent_containers/food/snacks/skrellsnacks
description_fluff = "A jerky product made of Go'moa mushrooms native to the Skrellian homeworld of Qerr'balak. SkrellSnaks are actually a product of Natuna, designed to welcome Ue-Katish refugees to their colony. The brand was recreated by Centauri Provisions after Natuna and SolGov broke off diplomatic relations."
description_fluff = "A jerky product made of Go'moa mushrooms native to the Skrellian homeworld of Qerr'balak. SkrellSnaks are actually a product of Natuna, designed to welcome Ue-Katish refugees to their colony."
/obj/item/reagent_containers/food/snacks/unajerky
description_fluff = "Removed from Getmore vendors pending approval from the SolGov Nutrition Council, Sissalik Jerky remains a popular snack for Unathi immigrants and daredevils looking for a meaty, spicy treat that makes Scaredy's look like tofu."
description_fluff = "Removed from Getmore vendors following ethical questions about the source of the meat, Sissalik Jerky remains a popular snack for Unathi immigrants and daredevils looking for a meaty, spicy treat that makes Scaredy's look like tofu."

14
code/modules/lore_codex/lore_data/political_parties.dm
View File

@@ -1,7 +1,7 @@
/datum/lore/codex/category/political_factions
name = "Political Factions"
data = "Those wishing to immigrate to somewhere in Vir, or otherwise plan to stay for a long time should get to know human politics. \
There are presently three major political parties that exist throughout SolGov space, being the Icarus Front, the Shadow Coalition, and \
There are presently three major political parties that exist throughout OriCon space, being the Icarus Front, the Shadow Coalition, and \
the Sol Economic Organization, and several smaller ones which tend to align themselves among one of the major parties. In the Vir system, the \
Icarus Front's influence is much less than somewhere closer to Sol, and the other two parties being more popular."
children = list(
@@ -20,7 +20,7 @@
/datum/lore/codex/page/icarus_front/add_content()
name = "Icarus Front"
keywords += list("Icarus", "IF")
data = "The political group with the most seats in the [quick_link("SolGov")] legislature and control over the heartworlds of humanity, the Icarus Front is a \
data = "The political group with the most seats in the [quick_link("OriCon")] legislature and control over the heartworlds of humanity, the Icarus Front is a \
conservative body with a long history, tracing its linage back to the political unrest that created the Sol Confederate Government. Icarus calls \
for severe restrictions on \"transformative technologies\" any technology with the power to fundamentally alter humanity, such as advanced artificial \
intelligence and human genetic augmentation. Previously an unbeatable political force, recent changes have lead to its power backsliding. It remains a \
@@ -36,7 +36,7 @@
/datum/lore/codex/page/sol_economic_organization/add_content()
name = "Sol Economic Organization"
keywords += list("SEO")
data = "The newest force in [quick_link("SolGov")] politics, backed by the massive [quick_link("TSC", "Trans-Stellar Corporations")] and the [quick_link("Free Trade Union")], \
data = "The newest force in [quick_link("OriCon")] politics, backed by the massive [quick_link("TSC", "Trans-Stellar Corporations")] and the [quick_link("Free Trade Union")], \
as well as former [quick_link("Icarus")] warhawks. The SEO campaigns for minimal regulation on the development of new technologies, seeing them as anti-capitalist and \
inefficient, and have gained significant traction among futurists, those wishing for a more impressive human military, and employee-residents of TSC \
corporate towns, such as the [quick_link("Northern Star")].\
@@ -82,9 +82,9 @@
/datum/lore/codex/page/multinational_movement/add_content()
name = "Multinational Movement"
keywords += list("Multinational")
data = "The barely-unified voice of [quick_link("SolGov", "SolGov's")] various independence movements, encompassing Terran governments wishing for a lighter touch \
from SolGov, fringe colonies who balk at the call of distant masters, anarchist movements who want the freedom to live without government oversight, and the rare \
Trans-Stellar who no longer see a benefit in working with SolGov. Full colonial independence is still a political impossibility so long as the \
data = "The barely-unified voice of [quick_link("OriCon", "OriCon's")] various independence movements, encompassing Terran governments wishing for a lighter touch \
from OriCon, fringe colonies who balk at the call of distant masters, anarchist movements who want the freedom to live without government oversight, and the rare \
Trans-Stellar who no longer see a benefit in working with OriCon. Full colonial independence is still a political impossibility so long as the \
[quick_link("Icarus Front")] holds any sway, and so the Movement is focused primarily on securing more autonomy in governance, although a growing revolutionary sub-group \
wants to force their change on the government en masse. The Multinational Movement finds themselves in an uneasy alliance with the [quick_link("SEO")], connected by their corporate, \
fringe-system membership, and often provide a dissenting voice to SEO's war hawks."
@@ -95,5 +95,5 @@
data = "A softer counterpoint to the [quick_link("SEO")], the FTU is a party representing small businesses, workers' syndicates, and trade unions, who advocate for government \
measures to reduce the amount of power held by the TSCs. In many ways a holdover from the days before the [quick_link("Shadow Coalition")], where corporate malfeasance took \
the place of technological development as the primary issue of debate, the FTU has found itself adopting technological positions similar to the SEO as a matter \
of pragmatism, although the views of individual members vary. The FTU is known for their intense lobbying of SolGov to add tax rebates to the purchases of \
of pragmatism, although the views of individual members vary. The FTU is known for their intense lobbying of OriCon to add tax rebates to the purchases of \
personal lathes and the creation of open-source firmware for experimental autolathes, but have thus far found little success."

74
code/modules/lore_codex/news_data/main.dm
View File

@@ -115,15 +115,15 @@
/datum/lore/codex/page/article3
name = "2/10/62 - Aetolian Partisans Declare Independence"
data = "Breaking their week-long silence, the leaders of the Aetolian Coup, and their spokesperson and presumed leader Naomi Harper issued an address earlier today, delivered to the Oculum Broadcast office on Pearl by drone courier. Quote Dr. Harper: \"Our previous silence was a necessity, while we consolidated our forces and dealt with corporatists both internally and in Vounna's former Grayson outposts.\". In Harper's hour-long address, she berates the failure of SolGov to provide adequate protections for Prometheans. \"We will not let the Promethean be another positronic brain; they will not labor under a century of slavery, deprived of a state to call their own. The Luddites of the Friends and of the Icarus Front will not be permitted to decide the fate of a nascent race before it begins.\"\
data = "Breaking their week-long silence, the leaders of the Aetolian Coup, and their spokesperson and presumed leader Naomi Harper issued an address earlier today, delivered to the Oculum Broadcast office on Pearl by drone courier. Quote Dr. Harper: \"Our previous silence was a necessity, while we consolidated our forces and dealt with corporatists both internally and in Vounna's former Grayson outposts.\". In Harper's hour-long address, she berates the failure of OriCon to provide adequate protections for Prometheans. \"We will not let the Promethean be another positronic brain; they will not labor under a century of slavery, deprived of a state to call their own. The Luddites of the Friends and of the Icarus Front will not be permitted to decide the fate of a nascent race before it begins.\"\
<br><br>\
Harper proceeded to unilaterally declare Vounna's independence from SolGov, claiming sovereignty over the system as the first Chairperson of the \"Aetolian Council\". Speaker of the Shadow Coalition ISA-5 has urged their government to treat the developing situation with caution but decried Harper's rhetoric, stating in a press release, \"While I know well the injustices visited on myself and my people by misguided forbearers, it is important to treat any emerging technology with respect. Current policies regarding the Prometheans are designed to limit risk during sociological trials on Aetolus and beyond. As for myself, I doubt the sincerity of this human who claims to speak for the Prometheans, when the Prometheans are perfectly equipped to speak for themselves.\"\
Harper proceeded to unilaterally declare Vounna's independence from OriCon, claiming sovereignty over the system as the first Chairperson of the \"Aetolian Council\". Speaker of the Shadow Coalition ISA-5 has urged their government to treat the developing situation with caution but decried Harper's rhetoric, stating in a press release, \"While I know well the injustices visited on myself and my people by misguided forbearers, it is important to treat any emerging technology with respect. Current policies regarding the Prometheans are designed to limit risk during sociological trials on Aetolus and beyond. As for myself, I doubt the sincerity of this human who claims to speak for the Prometheans, when the Prometheans are perfectly equipped to speak for themselves.\"\
<br><br>\
NanoTrasen is expected to redouble their Promethean research programs in the Vir system until stability is restored to Vounna."
/datum/lore/codex/page/article4
name = "2/14/62 - SCG Denounces Aetolian Coup; Mobilizes Fleet"
data = "Dismissing claims of inaction, a spokesperson for the Solar Confederate Government today confirmed that the Colonial Assembly has voted overwhelmingly in favor of swift military action in response to the coup on Aetolus earlier this month. Icarus Front Chairperson Mackenzie West was quick to make a damning official statement: \"Dr. Harper and her radical agitators cannot be excused for their violent, despicable attempts to destabilize the flourishing economy of the Almach Rim. The ruthless murder of innocents, and illegal seizure of private property are crimes that cannot merely be met with strong words and gentle slaps to the wrist\"...\"I am proud to announce that two units of brave Solar marines have been assigned to the SCG-R Song Shi rapid response cruiser, with the full backing of the Icarus Front - and I hope with my heart, the backing of all patriotic Solar citizens.\"\
data = "Dismissing claims of inaction, a spokesperson for the Orion Confederation Government today confirmed that the Colonial Assembly has voted overwhelmingly in favor of swift military action in response to the coup on Aetolus earlier this month. Icarus Front Chairperson Mackenzie West was quick to make a damning official statement: \"Dr. Harper and her radical agitators cannot be excused for their violent, despicable attempts to destabilize the flourishing economy of the Almach Rim. The ruthless murder of innocents, and illegal seizure of private property are crimes that cannot merely be met with strong words and gentle slaps to the wrist\"...\"I am proud to announce that two units of brave Solar marines have been assigned to the SCG-R Song Shi rapid response cruiser, with the full backing of the Icarus Front - and I hope with my heart, the backing of all patriotic Solar citizens.\"\
<br><br>\
The decision faced resistance from more laissez faire Assembly member states, including prominent SEO governor Bruno Ofako, delaying an earlier consensus. Supporters of the action hope that this decisive display of military strength will encourage the rebels to stand down without further bloodshed, and submit to prosecution by the Lunar High Courts.\
<br><br>\
@@ -141,7 +141,7 @@
/datum/lore/codex/page/article6
name = "3/03/62 - A Week Out From Almach: What are the facts?"
data = "* Several organizations in the Almach Rim, including Angessa's Pearl, the Aetolian Council, the Interstellar Workers of Wythe, the Republic of Whitney, and members of several prominent families in the Neon Light unilaterally declared secession from SCG. <br><br>*This secession was first called the Grey Hour by political scientists in New Florence, a term popularized by reporter Elspor Fong. <br><br>* Shelf, the FRF, and the EFRB were declared \"observers\" in the Almach Association charter. <br><br>* None of these organizations have issued a statement on the matter.<br><br>* The SCG-R Song Shi was stranded in the region during the secession.<br><br>* SolGov has not issued an official statement of the fate of the Song Shi.<br><br>* Several confederate agencies, including Emergent Intelligence Oversight, the Trade and Customs Bureau, and SCG Fleet Intelligence have declared a \"state of emergency\".<br><br>* SolGov itself has NOT declared a state of emergency.<br><br>* Legitimate communications in and out of the Almach Rim are restricted to audited text messages for the period.<br><br>* Several illegitimate communication links exist and are believed by Fleet Intelligence to be currently hosting the official sites for Morpheus Cyberkinetics and for the Association itself.<br><br>* Icarus Front chairperson Mackenzie West has proposed a moratorium on the creation of new Prometheans for the duration of the crisis.<br><br>* Local laws on the subject will apply until the Assembly meets late in May. <br><br>* No confederate lawmaker has proposed action against Relani, Shelfican, or newly Almachi nationals living within stable regions.<br><br>* The border remains tightly closed to migrants, media, and diplomats alike."
data = "* Several organizations in the Almach Rim, including Angessa's Pearl, the Aetolian Council, the Interstellar Workers of Wythe, the Republic of Whitney, and members of several prominent families in the Neon Light unilaterally declared secession from SCG. <br><br>*This secession was first called the Grey Hour by political scientists in New Florence, a term popularized by reporter Elspor Fong. <br><br>* Shelf, the FRF, and the EFRB were declared \"observers\" in the Almach Association charter. <br><br>* None of these organizations have issued a statement on the matter.<br><br>* The SCG-R Song Shi was stranded in the region during the secession.<br><br>* OriCon has not issued an official statement of the fate of the Song Shi.<br><br>* Several confederate agencies, including Emergent Intelligence Oversight, the Trade and Customs Bureau, and SCG Fleet Intelligence have declared a \"state of emergency\".<br><br>* OriCon itself has NOT declared a state of emergency.<br><br>* Legitimate communications in and out of the Almach Rim are restricted to audited text messages for the period.<br><br>* Several illegitimate communication links exist and are believed by Fleet Intelligence to be currently hosting the official sites for Morpheus Cyberkinetics and for the Association itself.<br><br>* Icarus Front chairperson Mackenzie West has proposed a moratorium on the creation of new Prometheans for the duration of the crisis.<br><br>* Local laws on the subject will apply until the Assembly meets late in May. <br><br>* No confederate lawmaker has proposed action against Relani, Shelfican, or newly Almachi nationals living within stable regions.<br><br>* The border remains tightly closed to migrants, media, and diplomats alike."
/datum/lore/codex/page/article7
name = "3/21/62 - Relan, Shelf Join the Almach Association"
@@ -158,7 +158,7 @@
/datum/lore/codex/page/article8
name = "4/1/62 - Almach Cordon Breached by Unknown Organization"
data = "Early this morning, SolGov ships assigned to the Almach Cordon around the Rim territories reported that a number of bulk freighters had eluded apprehension and are now at large within the Golden Crescent. Captain Volkov of the SCG-D Henri Capet reports that the blockade-runners were highly organized and determined, citing several lightly-manned ships left behind to tie up the SolGov forces long enoughfor the freighters to escape, detonating their reactors when they lost the ability to continue fighting. This resulted in three Fleet casualties and a significant degree of damage to the Henri Capet. The contents and location of the freighters are unknown at this time. In response, eight light-response vessels are being assigned to the Saint Columbia Fleet Base from Jahan's Post and Zhu Que. Residents and traffic officials in Vir, Oasis, and Gavel are to remain alert and notify police if any suspicious or unregistered craft enter their space.\
data = "Early this morning, OriCon ships assigned to the Almach Cordon around the Rim territories reported that a number of bulk freighters had eluded apprehension and are now at large within the Golden Crescent. Captain Volkov of the SCG-D Henri Capet reports that the blockade-runners were highly organized and determined, citing several lightly-manned ships left behind to tie up the OriCon forces long enoughfor the freighters to escape, detonating their reactors when they lost the ability to continue fighting. This resulted in three Fleet casualties and a significant degree of damage to the Henri Capet. The contents and location of the freighters are unknown at this time. In response, eight light-response vessels are being assigned to the Saint Columbia Fleet Base from Jahan's Post and Zhu Que. Residents and traffic officials in Vir, Oasis, and Gavel are to remain alert and notify police if any suspicious or unregistered craft enter their space.\
<br><br>\
A spokesperson for the Association claims that, while they make no attempts to stop aspiring blockade runners, the organization responsible for this most recent attack is unaffiliated with the Association as a whole and deny any knowledge of their identity or motives."
@@ -170,23 +170,23 @@
/datum/lore/codex/page/article10
name = "4/13/62 - Association Proposes Joint Operation"
data = "Condemning the actions of Boiling Point on Gavel this week, representatives from the Almach Association and SolGov met to discuss joint fleet action. At the end of nearly a week of closed-doors negotiations, the Association has agreed to send in a significant contingent of Association Militia vessels as a show of good-will. These vessels will be active in the Golden Crescent, searching for Boiling Point facilities believed to be located in the outskirts of major systems. The influx of manpower allows the Fleet to continue patrolling the Heights and the Bowl, in hopes of containing the spread of the organization. This operation also marks the opening of the Almach Cordon, although travelers are advised that migration between the regions will remain extremely limited.\
data = "Condemning the actions of Boiling Point on Gavel this week, representatives from the Almach Association and OriCon met to discuss joint fleet action. At the end of nearly a week of closed-doors negotiations, the Association has agreed to send in a significant contingent of Association Militia vessels as a show of good-will. These vessels will be active in the Golden Crescent, searching for Boiling Point facilities believed to be located in the outskirts of major systems. The influx of manpower allows the Fleet to continue patrolling the Heights and the Bowl, in hopes of containing the spread of the organization. This operation also marks the opening of the Almach Cordon, although travelers are advised that migration between the regions will remain extremely limited.\
<br><br>\
While undoubtedly a sign of increased trust between the Confederacy and the Rim, some have voiced concerns with the action's adding legitimacy to the Association government. Quote Rewi Kerahoma, SEO Chairperson of the Board: \"The meeting with the Association regime was inappropriate, but actively allying with them is something else entirely. If the generals think we don't have the fleet to hunt down a bunch of rabble-rousers without weakening ourselves to piracy and foreign invasion, then it is a sign that we need to grow our shipyards in the Bowl, and give jobs to the hardworking Solars that live there-- not that we need to collaborate with terrorists.\"\
<br><br>\
Transgressive Technologies and Interior Police Executive Sifat Unar issued a memo indicating that, while the assistance of the Association's more conservative elements in this matter is appreciated, the Five Points of Human Sanctity remain intact and SolGov categorically refuses aid from \"transhumans, posthumans, uplifts, and Fortunates.\""
Transgressive Technologies and Interior Police Executive Sifat Unar issued a memo indicating that, while the assistance of the Association's more conservative elements in this matter is appreciated, the Five Points of Human Sanctity remain intact and OriCon categorically refuses aid from \"transhumans, posthumans, uplifts, and Fortunates.\""
/datum/lore/codex/page/article11
name = "4/29/62 - New Data from Shelf Suggests Continued Migration"
data = "Despite their recent inclusion in the Almach Association, astronomers have confirmed that Shelf is continuing to migrate along the Almach Stream to a new star. Sources within the Association claim that Shelf's participation in the organization has been \"lukewarm at best\", and that their continued migration is to be expected. Morpheus executives have refrained from issuing a statement on the matter, but given their statements upon entering the Association are believed to view themselves as personally culpable for the Gray Hour. Analysts suggest that Shelf may be unwilling to enter a shooting war with SolGov if the situation in the Rim destabilizes."
data = "Despite their recent inclusion in the Almach Association, astronomers have confirmed that Shelf is continuing to migrate along the Almach Stream to a new star. Sources within the Association claim that Shelf's participation in the organization has been \"lukewarm at best\", and that their continued migration is to be expected. Morpheus executives have refrained from issuing a statement on the matter, but given their statements upon entering the Association are believed to view themselves as personally culpable for the Gray Hour. Analysts suggest that Shelf may be unwilling to enter a shooting war with OriCon if the situation in the Rim destabilizes."
/datum/lore/codex/page/article12
name = "5/07/62 - Allen Family Matriarch Expelled from Neon Light"
data = "The Allen family of the Neon Light, the largest single habitat-ship in Solar space, has been ousted in a nearly bloodless coup today. The Allens, staunch supporters of the Association and advocates for the criminal ark's inclusion in the organization, had attempted to seize control of the ship's agricultural region during the Almach Cordon. They effectively held the ship for a matter of weeks, but were defeated by loyalists to the reigning Crow family. Stripped of their position as rulers of the Third Stacks, their matriarch was summarily executed by spacing in what the current regime is referring to as an \"expedited exile\". This is believed to mark the end of the question of Neon Light's membership in the Association, and the nominal SolGov protectorate is expected to remain neutral for the foreseeable future."
data = "The Allen family of the Neon Light, the largest single habitat-ship in Solar space, has been ousted in a nearly bloodless coup today. The Allens, staunch supporters of the Association and advocates for the criminal ark's inclusion in the organization, had attempted to seize control of the ship's agricultural region during the Almach Cordon. They effectively held the ship for a matter of weeks, but were defeated by loyalists to the reigning Crow family. Stripped of their position as rulers of the Third Stacks, their matriarch was summarily executed by spacing in what the current regime is referring to as an \"expedited exile\". This is believed to mark the end of the question of Neon Light's membership in the Association, and the nominal OriCon protectorate is expected to remain neutral for the foreseeable future."
/datum/lore/codex/page/article13
name = "5/15/62 - Anti-Fleet Riots on Saint Columbia"
data = "As military vessels from the Almach Association continue to enter the Golden Crescent as part of a SolGov initiative to combat the Boiling Point terrorists believed to be hiding in the region, political unrest in the upstream portions of the region continue to grow. Many in the Republic of Saint Columbia, a small upstream nation, have responded to increasing militarization of their local Fleet base by taking to the streets, blocking pedestrian traffic in the capital of Barrueco and shutting down entire industries by destroying or disabling infrastructure. Quote rioter Luisa Tassis, \"we've been sick of the Fleeties squatting in our system and breathing down our neck, and now there's going to be even more of them? No, screw that. If there's going to be a war between the Rim and the Core, I know what side I'd rather be on.\"\
data = "As military vessels from the Almach Association continue to enter the Golden Crescent as part of a OriCon initiative to combat the Boiling Point terrorists believed to be hiding in the region, political unrest in the upstream portions of the region continue to grow. Many in the Republic of Saint Columbia, a small upstream nation, have responded to increasing militarization of their local Fleet base by taking to the streets, blocking pedestrian traffic in the capital of Barrueco and shutting down entire industries by destroying or disabling infrastructure. Quote rioter Luisa Tassis, \"we've been sick of the Fleeties squatting in our system and breathing down our neck, and now there's going to be even more of them? No, screw that. If there's going to be a war between the Rim and the Core, I know what side I'd rather be on.\"\
<br><br>\
Association leaders have refrained from officially supporting the rioters, though many suspect that Association propagandists have sparked the unrest. Solar officials, on the other hand, were quick to offer assurances that the unrest will be calmed long before it begins to affect the Fleet base in system."
@@ -194,13 +194,13 @@
name = "5/25/62 - Harper's Aetolus Remains Shadowed"
data = "The recent detente with the Almach Association has prompted easier communications with Rim governments. Loved ones separated by the cordon have a chance to communicate once more, trade is posed to recommence, and light has been shed on the conditions of Shelf, Relan, and Angessa's Pearl. Amid this light is a patch of darkness. The fourth major polity of the Association, the Aetolian Council remains inscrutable, with no publicly-available information in the system available after their purge of corporate loyalists during the Gray Hour. What reports do exist are rumors within the Rim of Aetolian projects to create a new, hardier strain of Promethean, potentially one in flagrant violation of the Five Points of Human Sanctity. It is also known that Aetolus is a contributor to the personnel of the military vessels that even now are active in the Golden Crescent, although no so-called \"Aeto-Prometheans\" are believed to be active outside of the rim at this time.\
<br><br>\
Aetolus is the only garden world in the Almach Rim and among the most difficult to reach from the nearby system of Saint Columbia. Its seclusion and economic independence give it a great deal of weight in the Association, where Council representatives are among the most vehement in their opposition to SolGov- at odds with the Association's decision to reject Boiling Point's pan-Solar revolutionary praxis. It remains to be seen if Aetolus' hawkish ideals will fade over time, but because of the structure of the Association, there is no real chance of the junta being expelled from the government or removed from control of the Vounna system."
Aetolus is the only garden world in the Almach Rim and among the most difficult to reach from the nearby system of Saint Columbia. Its seclusion and economic independence give it a great deal of weight in the Association, where Council representatives are among the most vehement in their opposition to OriCon- at odds with the Association's decision to reject Boiling Point's pan-Solar revolutionary praxis. It remains to be seen if Aetolus' hawkish ideals will fade over time, but because of the structure of the Association, there is no real chance of the junta being expelled from the government or removed from control of the Vounna system."
/datum/lore/codex/page/article15
name = "7/05/62 - The Fate of the SCG-R Song Shi"
data = "Lifepods confirmed to have originated from response ship lost during the Gray Hour were found last week in the Vir system, impacting the NLS Southern Cross at high velocity and severely injuring the only two survivors of the expedition. Unfortunately, because of the generally confused conditions of their re-emergence from months of cryosleep, the fate of the lost ship remains incompletely understood. The first pod to be discovered contained Lieutenant Eos Futura, telecommunications expert on the Song Shi, who alleged that elements of the Song Shi's crew, including herself, mutinied against commanding officer Captain Yi He in an attempt to prevent the bombing of civilians in the Angessian capital of Skylight. The surivor of the second pod, Private Demori Salvo, accused Futura's faction of conspiring with Association spies to destroy the ship as part of the Gray Hour revolt. Both agreed that the mutineers detonated the ship's Supermatter power core when it became clear they were to be defeated.\
<br><br>\
A third pod, promising a resolution to the stalemate, was shot down by the SCG-P Juno after being misidentified as a hostile missile. The gunner responsible, Sergeant Ricardo Esteban, was found guilty by a court marshal and dishonorably discharged. While other pods from the Song Shi may still be traveling through SolGov space, it is considered unlikely based on both Futura and Salvo's account of the number of pods launched before the Song Shi was destroyed. Both were detained by staff at the NLS Southern Cross, who managed to prevent a violent altercation from breaking out between the two armed and disturbed servicepersons. The Colonial High Court has stated that it intends to hear testimony from both parties after they complete a course of mental health evaluation, and after the conclusion of the present state of heightened security."
A third pod, promising a resolution to the stalemate, was shot down by the SCG-P Juno after being misidentified as a hostile missile. The gunner responsible, Sergeant Ricardo Esteban, was found guilty by a court marshal and dishonorably discharged. While other pods from the Song Shi may still be traveling through OriCon space, it is considered unlikely based on both Futura and Salvo's account of the number of pods launched before the Song Shi was destroyed. Both were detained by staff at the NLS Southern Cross, who managed to prevent a violent altercation from breaking out between the two armed and disturbed servicepersons. The Colonial High Court has stated that it intends to hear testimony from both parties after they complete a course of mental health evaluation, and after the conclusion of the present state of heightened security."
/datum/lore/codex/page/article16
name = "7/11/62 - First Intelligence-Augmentation Surgery on Angessa's Pearl"
data = "Confirming fears of Association transgressions, sources at Angessa's Pearl confirmed that the aging founder of the theocracy, Angessa Martei, completed a course of neural surgery designed to improve her mental capacity by as much as 15%, building off of last year's creation of the procedure by a Qerr-Gila-owned doctor. While the research in question was believed to be destroyed, there is reason to suspect that it instead made its way into the hands of current Association leaders. In addition to proving their willingness to violate the Five Points, this demonstrates that the Angessians harbored schemes of secession since at the very latest Feburary 2559. Numerous human or transhuman figures in the Association are rumored to be on the wait list for the procedure, including Naomi Harper and the present Exalt of the Pearl."
@@ -271,7 +271,7 @@
/datum/lore/codex/page/article21
name = "11/19/62 - Saint Columbia To Hold Special Election After Half a Year of Unrest"
data = "After five months of riots causing significant damage to industrial assets, life support, and government facilities, Saint Columbia seems poised to recover. A new constitution for the so-called \"Saint Columbia Democratic Union\" was posted online to significant acclaim. An influential militia group lead by Casini immigrant Luisa Tassis claimed responsibility for the constitution and will be hosting a referendum for all residents of the seven habitation domes of the nation. If adopted, Saint Columbia will remain a member state of SolGov, but Tassis' noted hostility towards the Solar Fleet makes it unlikely that continued presence of the Saint Columbia Fleet Base will be tolerated.\
data = "After five months of riots causing significant damage to industrial assets, life support, and government facilities, Saint Columbia seems poised to recover. A new constitution for the so-called \"Saint Columbia Democratic Union\" was posted online to significant acclaim. An influential militia group lead by Casini immigrant Luisa Tassis claimed responsibility for the constitution and will be hosting a referendum for all residents of the seven habitation domes of the nation. If adopted, Saint Columbia will remain a member state of OriCon, but Tassis' noted hostility towards the Solar Fleet makes it unlikely that continued presence of the Saint Columbia Fleet Base will be tolerated.\
<br><br>\
Extreme measures are being taken to avoid interference in the referendum, with external communications links disabled for the duration and weapons systems primed to fire on any vessel within range. Tassis insists that such measures are necessary, due to the system's extremely important position relative to Almach and the Golden Crescent. Quote Tassis, \"if you rat bastards \[from the Fleet\] step so much as one micron too close to Barrueco, we will view it as an act of terror. Don't try it.\"\
<br><br>\
@@ -279,13 +279,13 @@
/datum/lore/codex/page/article22
name = "11/20/62 - Natuna Made \"Observer\" Of Almach Association"
data = "Independent anarchist system Natuna Bhumi Barisal has declared its intention to act as a neutral \"observer\" nation in the ongoing Almach secession crisis. A planetary spokesperson from Natuna this morning expressed concerns that parties in the current military partnership between the Solar Confederate Government and Almach Association in the fight against mercurial terrorist organization Boiling Point were not being treated with the mutual respect that should be expected. Natuna alleges that the Almach Militia are being treated more as \"disposable tools\" in the conflict than as members of a legitimate independent government military entity.\
data = "Independent anarchist system Natuna Bhumi Barisal has declared its intention to act as a neutral \"observer\" nation in the ongoing Almach secession crisis. A planetary spokesperson from Natuna this morning expressed concerns that parties in the current military partnership between the Orion Confederation Government and Almach Association in the fight against mercurial terrorist organization Boiling Point were not being treated with the mutual respect that should be expected. Natuna alleges that the Almach Militia are being treated more as \"disposable tools\" in the conflict than as members of a legitimate independent government military entity.\
<br><br>\
Natuna has previously remained silent on the Almach issue, despite its political leanings typically aligning with those of the secessionist government. However, despite gaining notoriety as a haven for human and Skrellian pirates, their pledge to \"ensure fair treatment\" of Almach forces comes as a surprise to some from a system that has historically adhered to Five Points guidelines. Political commentator and persistent critic of the Almach Association Nadine Okparo has described the Dark Triangle system's stance as \"Nothing short of openly hostile\" to the SCG and assuring peace in the Almach region."
/datum/lore/codex/page/article23
name = "11/21/62 - Admiral McMullen Promises Solution to Boiling Point to Come \"Soon\""
data = "Admiral Kaleb McMullen made a public statement this afternoon on the continued Boiling Point attacks within SCG space. Speaking from his office in the Saint Columbia Fleet Base, Admiral McMullen thoroughly reassured reporters that the attacks will come to a swift end. According to McMullen, \"The era of wanton destruction as a result of Boiling Point's madness is coming to a close. Our command staff and proud servicepeople have been training and revising a solution to this threat that has haunted our borders and threatened the stability of our colonies and the lives of the honest people of the Solar Confederate Government. With new options available I have full confidence Boiling Point will be a name left to the dust.\"\
data = "Admiral Kaleb McMullen made a public statement this afternoon on the continued Boiling Point attacks within SCG space. Speaking from his office in the Saint Columbia Fleet Base, Admiral McMullen thoroughly reassured reporters that the attacks will come to a swift end. According to McMullen, \"The era of wanton destruction as a result of Boiling Point's madness is coming to a close. Our command staff and proud servicepeople have been training and revising a solution to this threat that has haunted our borders and threatened the stability of our colonies and the lives of the honest people of the Orion Confederation Government. With new options available I have full confidence Boiling Point will be a name left to the dust.\"\
<br><br>\
Admiral McMullen, who has been stationed in Saint Columbia for nearly half a year of political and social unrest did not elaborate further on what he intended to do to solve the Boiling Point attacks, claiming that details would be forthcoming as \"operational security permits\"."
@@ -309,7 +309,7 @@
Military officials have reported the operation as a total success, and that \"several\" high-ranking Boiling Point organizers were killed in the raid, and that thanks to the work of allied intelligence operation teams much of Boiling Point's captured data may remain intact."
/datum/lore/codex/category/article27
name = "11/26/62 - Valentine's Ultimatum: All Eyes On Almach!"
data = "The Almach Association must adhere to the Five Points of Human Sanctity by the 14th of February next year or face war, according to a national address from the Colonial Assembly delivered by Secretary-General Mackenzie West this morning. The Icarus Front leader was at the forefront of a resolution to allow the secessionist government to remain independent of the Solar Confederate Government under the strict condition of faithfulness to Five Points laws, passing by a wide margin. Fundamental disagreement over Five Points regulation has been at the forefront of debate with the Almach provisional government, and is cited as one of the primary reasons for the systems' illegal declaration of independence early this year.\
data = "The Almach Association must adhere to the Five Points of Human Sanctity by the 14th of February next year or face war, according to a national address from the Colonial Assembly delivered by Secretary-General Mackenzie West this morning. The Icarus Front leader was at the forefront of a resolution to allow the secessionist government to remain independent of the Orion Confederation Government under the strict condition of faithfulness to Five Points laws, passing by a wide margin. Fundamental disagreement over Five Points regulation has been at the forefront of debate with the Almach provisional government, and is cited as one of the primary reasons for the systems' illegal declaration of independence early this year.\
<br><br>\
The internationally broadcast speech began with the much anticipated announcement that the Boiling Point terrorist group had been effectively destroyed, with over seven hundred arrests made over the course of the weekend as a result of sensitive data captured during the special forces raid in Vir on the 24th, including numerous high ranking members of the organization. West went on to praise forces involved in the months-long counter-terror operation, before highlighting the \"legacy of \[human\] togetherness\" that allowed it to happen - in a spiel that commentators suggest \"betrays the true intention of the Valentine's Ultimatum: Reunification\".\
<br><br>\
@@ -326,7 +326,7 @@
name = "The Valentine's Ultimatum"
data = "\[West shuffles some papers and clears their throat\]\
<br><br>\
Thank you. Citizens of the Solar Confederation, allies, and beyond... It is a great honor, on behalf of the Colonial Assembly to announce that joint operations against Boiling Point across the galaxy have come to an end. In the fight against brazen Mercurial terrorism, the Solar Confederate Government and her allies have prevailed.\
Thank you. Citizens of the Solar Confederation, allies, and beyond... It is a great honor, on behalf of the Colonial Assembly to announce that joint operations against Boiling Point across the galaxy have come to an end. In the fight against brazen Mercurial terrorism, the Orion Confederation Government and her allies have prevailed.\
<br><br>\
Over the past two days alone, I can report that over seven hundred arrests have been made, from the distant system of Nyx, to right here in Sol. I hold in my hand a list. \[West holds up a sheet of paper\] Leaders, organizers, brutes and bombers have been captured by brave, hardworking security forces throughout human space. The rest of these criminals have been scattered to the wind... But not lost! I can confidently assert that every last one will be brought to justice.\
<br><br>\
@@ -350,7 +350,7 @@
<br><br>\
Close to one hour ago, Naomi Harper and the leaders of the Almach Association were delivered an ultimatum:\
<br>\
The Almach Association will be allowed to exist as a government entity independent of the Solar Confederate Government going forward on one condition - full, unilateral compliance with the Five Points of Human Sanctity.\
The Almach Association will be allowed to exist as a government entity independent of the Orion Confederation Government going forward on one condition - full, unilateral compliance with the Five Points of Human Sanctity.\
<br><br>\
The deadline for this condition will be the 14th of February, 2563.\
<br><br>\
@@ -364,13 +364,13 @@
/datum/lore/codex/page/article28
name = "11/28/62 - \"Valentines Ultimatum\" Prompts Saint C. Secession"
data = "Just hours after reconnecting with the Exonet after voting in a new government, the colony of Saint Columbia has unilaterally seceded from SolGov and petitioned for inclusion within the Almach Association. This declaration, issued by First Secretary Luissa Tassis, is in stark contrast to pre-election promises of continued support of Sol. Admiral McMullen of the Saint Columbia Garrison remains in control of the Fleet Base, itself a large colony housing around 75000 civilian contractors and military families who were not party to the Barrueco Referendum or the new constitution.\
data = "Just hours after reconnecting with the Exonet after voting in a new government, the colony of Saint Columbia has unilaterally seceded from OriCon and petitioned for inclusion within the Almach Association. This declaration, issued by First Secretary Luissa Tassis, is in stark contrast to pre-election promises of continued support of Sol. Admiral McMullen of the Saint Columbia Garrison remains in control of the Fleet Base, itself a large colony housing around 75000 civilian contractors and military families who were not party to the Barrueco Referendum or the new constitution.\
<br><br>\
Efforts to ensure electoral validity and a peaceful exchange of power have been stymied by the presence of several dozen Militia vessels currently transiting from the Crescent to the Rim. Since the declaration went through, no Almachi vessels have been seen leaving the system, instead forming around Saint Columbia in an obvious defensive posture. The legality of this formation is questionable at best, as fleet activity in divided systems like Abel's Rest and Kauq'xum has been avoided for diplomatic reasons."
/datum/lore/codex/page/article29
name = "11/30/62 - Adm. McMullen Declares \"Iserlohn Republic\""
data = "Pursuant to the continuing hostility from Secretary Tassis' Saint Columbia Democratic Union and the Almach Militia, the civilians of the Saint Columbia Fleet Base have been organized into an Iserlohn Republic. Named after the largest single module of the station, the Republic has applied to the Colonial Assembly as an independent protectorate, with provisional recognition already extended by Executive of Development Zehava Collins. In a move decried as nepotistic, Admiral McMullen declared independence and installed his daughter Anya as interim President pending ratification of a constitution. SolGov Fleet protocol forbids any member of the service from accepting any political appointment and is believed to be the main reason he did not take power himself. Anya McMullen is the administrative head of the base's hydroponics array and is considered a highly respected citizen of the colony, relationship to its military administrator notwithstanding."
data = "Pursuant to the continuing hostility from Secretary Tassis' Saint Columbia Democratic Union and the Almach Militia, the civilians of the Saint Columbia Fleet Base have been organized into an Iserlohn Republic. Named after the largest single module of the station, the Republic has applied to the Colonial Assembly as an independent protectorate, with provisional recognition already extended by Executive of Development Zehava Collins. In a move decried as nepotistic, Admiral McMullen declared independence and installed his daughter Anya as interim President pending ratification of a constitution. OriCon Fleet protocol forbids any member of the service from accepting any political appointment and is believed to be the main reason he did not take power himself. Anya McMullen is the administrative head of the base's hydroponics array and is considered a highly respected citizen of the colony, relationship to its military administrator notwithstanding."
/datum/lore/codex/page/article30
name = "01/01/63 - Sif Governor Bjorn Arielsson to Retire"
@@ -403,19 +403,19 @@
<br><br>\
But, uh, as you can probably guess, they're not talking about the old kind of seccession. They're not thinking we'll stop paying Solar taxes and strike it out alone, the way some people did during the Age of Seccession. They want to join the Association. Now, if I were Secretary-General West, I might wax poetic about how the Association is a 'betrayal of our own humanity', or some... or some crock of shit like that, if you'll pardon my language. We're not all humans here. We're Tajaran and Unathi and Skrell and Positronics and even a few Teshari. And while that 'Valentines Ultimatum' might win West a lot of points with their lackies, and with the kind of maintenance-dome troglodyte who thinks the First Accord was a mistake, it's done more for the Association's recruitment than their entire propaganda budget. It's become expedient for leaders on both sides to treat this like a fight between the Core and the Rim, or between humans and positronics, or between tradition and progressivism, but it's not any of these. It's the oldest fight in the book. It's republicanism versus autocracy, and we're not the autocracy.\
<br><br>\
Angessa's Pearl is a theocratic autocracy led by Angessa Martei, who owns all property on the planet down to her people's bland white jumpsuits and the gray slop they eat. This isn't propaganda. This is objective fact, and something Martei is open about. Her seccession is a means for her to get more and more naked power over her slaves, and to grow more and more of them, until she's the immortal center of an industrial empire. The people of the Pearl didn't make the choice to join the Association. The people that are building her fleet and dying for her cause had no say in the matter. The injustice, the oppression here isn't that their rights to 'self-improvement' or 'self-expression' or 'freedom of thought' were trod on-- the injustice is that SolGov, that we allowed these abuses to persist for as long as they did. The injustice is that there are still so few laws in place to prevent things like this from happening in new colonies. The injustice is that, on seeing Martei's schemes actualized, we didn't take a cold, hard look at just how that was allowed to happen.\
Angessa's Pearl is a theocratic autocracy led by Angessa Martei, who owns all property on the planet down to her people's bland white jumpsuits and the gray slop they eat. This isn't propaganda. This is objective fact, and something Martei is open about. Her seccession is a means for her to get more and more naked power over her slaves, and to grow more and more of them, until she's the immortal center of an industrial empire. The people of the Pearl didn't make the choice to join the Association. The people that are building her fleet and dying for her cause had no say in the matter. The injustice, the oppression here isn't that their rights to 'self-improvement' or 'self-expression' or 'freedom of thought' were trod on-- the injustice is that OriCon, that we allowed these abuses to persist for as long as they did. The injustice is that there are still so few laws in place to prevent things like this from happening in new colonies. The injustice is that, on seeing Martei's schemes actualized, we didn't take a cold, hard look at just how that was allowed to happen.\
<br><br>\
I love SolGov. It's because of this love that I'm so furious at what we have allowed to happen to our people. The state of the Bowl is disgraceful. Nobody who looks to us for protection, who pays us taxes and levies, who is a member of our community, should live in fear of raider attacks. What we did to the positronics, the history we let ourselves repeat out of fear and greed, can never be forgiven, can never be repaired until Vir burns dark in our sky. The pogroms-- yes, the pogroms-- against the Unathi, against refugees fleeing their own religious autocracy, are a disgrace to everything we stand for. But of all the nations in the galaxy, with perhaps the exception of Casini's Reach, we are the only one founded for the good of the ruled, rather than the rulers. We are the only real commonwealth in known space. And that's why we need to strive for better. We are a burning beacon of liberty in a galaxy where nigh eighty percent of the population has no voice in the government. Every ounce of power we cede to the party bosses, or the corporations, or tinpot dictators like Angessa Martei, is a dimming, a flickering of that torch. \
I love OriCon. It's because of this love that I'm so furious at what we have allowed to happen to our people. The state of the Bowl is disgraceful. Nobody who looks to us for protection, who pays us taxes and levies, who is a member of our community, should live in fear of raider attacks. What we did to the positronics, the history we let ourselves repeat out of fear and greed, can never be forgiven, can never be repaired until Vir burns dark in our sky. The pogroms-- yes, the pogroms-- against the Unathi, against refugees fleeing their own religious autocracy, are a disgrace to everything we stand for. But of all the nations in the galaxy, with perhaps the exception of Casini's Reach, we are the only one founded for the good of the ruled, rather than the rulers. We are the only real commonwealth in known space. And that's why we need to strive for better. We are a burning beacon of liberty in a galaxy where nigh eighty percent of the population has no voice in the government. Every ounce of power we cede to the party bosses, or the corporations, or tinpot dictators like Angessa Martei, is a dimming, a flickering of that torch. \
<br><br>\
And this brings us back to the Association, and to those who sympathize with it. I do, too. I spent my entire career on sapient rights lobbying, on supporting the anti-malfesance efforts of my colleagues. For a disaffected positronic, for any friend to the positronic people, for those who have had their lives taken by corporations-- the Association seems like a miracle. And maybe, for those Mercurials, the ideas it's founded upon shine even brighter than our democracy. But I look at the Association, really look, and I see Angessa Martei lying in the center, spinning a great big web. I see Naomi Harper, lying through her teeth better than Mackenzie West ever could. Two of the biggest population bases in the Association, the two nations that started the whole Gray Hour, are autocracies. Once again, the ferver of the revolution is subsumed by the oligarchs who want to stay in power. I doubt, to the poor laborer on the Pearl, the word 'Mecurialism' means much. I doubt that once the shock of the seccession wears off, that the young Promethean soldier will find themselves in a better place in Harper's junta than they will here in Vir.\ I doubt that in ten years' time the miners, pioneers, and traders who seized their means of production will find the Association Militia a kinder master than Xion, Nanotrasen, or Major Bill's. \
<br><br>\
This is far from a blanket condemnation of every government in the Association. President Fisher of the FRF-- I consider her a friend. When she gave her speech this March about strengthening and guiding the Almachi Revolution, I thought long and hard about whether we might do the same. I certainly commend the effort. But the structure of the Association was penned by the same autocrats that, to do her words justice, Fisher will have to overthrow. There's no High Court, no checks or balances. The Association is an alliance penned as though deliberately ignoring two thousand years of political science. By striving to counter-balance these autocrats, Fisher plays into their hands. She commits her own fleet, weakens her own defenses against enemies closer to home, in the service of Martei's ambitions. \
<br><br>\
I don't see this whole affair as a chance to spread the galactic anti-corporate revolution the way President Fisher does, of course. I make no secret of my stance on Trans-Stellars, but I also know that we're better off with Sol than without. The 'Silent Collapse' was two hundred years ago, but we still bear the scars from it. When the Scandinavian Union pulled out support for the Sivian colonization project, SolGov saved us. I do mean saved us, sure as if they'd fished us out of a life pod. There were no factories, no steel, no concrete on Sif until the Engineering Corps built Radiance and New Reykjavik. Corporations and regional governments cowered from the Karan pirates, until the Marines chased them out. Whether Sivian or Karan, you owe the roof over your head to the Sol Confederate Government. With that great debt in mind, how dare we turn our backs on the Bowl, or Abel's Rest, or Nyx, when they need us! How dare we let oligarchs prey on the weak! How dare we choose not to act when we have, by virtue of our votes in the Assembly and our voice within the halls of public debate, the means to share our peace and prosperity with the rest of our people!\
I don't see this whole affair as a chance to spread the galactic anti-corporate revolution the way President Fisher does, of course. I make no secret of my stance on Trans-Stellars, but I also know that we're better off with Sol than without. The 'Silent Collapse' was two hundred years ago, but we still bear the scars from it. When the Scandinavian Union pulled out support for the Sivian colonization project, OriCon saved us. I do mean saved us, sure as if they'd fished us out of a life pod. There were no factories, no steel, no concrete on Sif until the Engineering Corps built Radiance and New Reykjavik. Corporations and regional governments cowered from the Karan pirates, until the Marines chased them out. Whether Sivian or Karan, you owe the roof over your head to the Sol Confederate Government. With that great debt in mind, how dare we turn our backs on the Bowl, or Abel's Rest, or Nyx, when they need us! How dare we let oligarchs prey on the weak! How dare we choose not to act when we have, by virtue of our votes in the Assembly and our voice within the halls of public debate, the means to share our peace and prosperity with the rest of our people!\
<br><br>\
This is what I mean by SolGov being the only true republic, the only state founded for the common good. The 'human spirit' West croons on about isn't our industriousness, or our skill at arms. If humanity-- if this Terran culture is commendable for anything, it is that we assist our fellows. We take in Casteless Skrell, Unbound Unathi, republican Tajaran. We pass around the hat when someone's house burns down. We help our friends, our neighbors, and even strangers. The fact that Martei and Harper are perverting this impulse, padding their juntas with the air of legitimacy to inspire honest people to ride to their defense, is the reason their state is unconscionable, the reason it was was born flawed, the reason we cannot suffer it to continue, much less help it on its way.\
This is what I mean by OriCon being the only true republic, the only state founded for the common good. The 'human spirit' West croons on about isn't our industriousness, or our skill at arms. If humanity-- if this Terran culture is commendable for anything, it is that we assist our fellows. We take in Casteless Skrell, Unbound Unathi, republican Tajaran. We pass around the hat when someone's house burns down. We help our friends, our neighbors, and even strangers. The fact that Martei and Harper are perverting this impulse, padding their juntas with the air of legitimacy to inspire honest people to ride to their defense, is the reason their state is unconscionable, the reason it was was born flawed, the reason we cannot suffer it to continue, much less help it on its way.\
<br><br>\
Now, I'm sure you've noticed by now, that I haven't said much more than three words about technoprogressivism, or transtech, or whatever the word du jour is. Frankly, that's on purpose. 'Transtech' has never once been about technology. The Icarus Front-- the old one, that united us and took us to the stars, not the new one we spend forty hours a week arguing with about healthcare-- The Icarus Front was a popular revolution, you know. Hel, they were Marxists. It was a world where the kind of lack of accountability, the entrenched oligarchy and geographical class divide that we're dealing with now was spiraling out of control. In the old United States, the rich and powerful got the technology to grow loyal subjects in tubes, to make drone intelligences smarter in some ways than a human could ever be, to-- well, to do what Angessa Martei's done, only with no SolGov to stop her. Meanwhile, the 'little people' in the Middle East, Southeast Asia, and other 'forgotten' parts of the world were left behind, hopelessly. I don't mean to downplay the importance of the Gray Tide, but if you look at historical accounts from that era, the thing that really united the Front was the knowledge that, if they didn't act immediately, they'd be seen as 'externalities' by immortal superintelligent businesspeople and politicians. The take-away from the Gray Tide should never have been that 'nanotechnology is dangerous'-- it should have been 'nobody should be able to destroy an entire city without facing consequences.'\
Now, I'm sure you've noticed by now, that I haven't said much more than three words about technoprogressivism, or transtech, or whatever the word du jour is. Frankly, that's on purpose. 'Transtech' has never once been about technology. The Icarus Front-- the old one, that united us and took us to the stars, not the new one we spend forty hours a week arguing with about healthcare-- The Icarus Front was a popular revolution, you know. Hel, they were Marxists. It was a world where the kind of lack of accountability, the entrenched oligarchy and geographical class divide that we're dealing with now was spiraling out of control. In the old United States, the rich and powerful got the technology to grow loyal subjects in tubes, to make drone intelligences smarter in some ways than a human could ever be, to-- well, to do what Angessa Martei's done, only with no OriCon to stop her. Meanwhile, the 'little people' in the Middle East, Southeast Asia, and other 'forgotten' parts of the world were left behind, hopelessly. I don't mean to downplay the importance of the Gray Tide, but if you look at historical accounts from that era, the thing that really united the Front was the knowledge that, if they didn't act immediately, they'd be seen as 'externalities' by immortal superintelligent businesspeople and politicians. The take-away from the Gray Tide should never have been that 'nanotechnology is dangerous'-- it should have been 'nobody should be able to destroy an entire city without facing consequences.'\
<br><br>\
That was more of a history lesson than I had meant, but it's important to look at these sorts of things in context. I know transtech and the Five Points have been used as an excuse for pejudice against Skrell, Mercurials, positronics, the FTU, communism, the disabled, and most recently Prometheans. But all the Five Points are supposed to mean - what they would say if the people who had written them were alive today, is that everyone deserves an equal playing field. When the ruling class is smarter, stronger, and longer lived than the classes they rule over-- well, I could wax poetic again, or I could just point you towards the Hegemony and their 'clients'. The Hegemony is bad enough. Let's not give Angessa Martei a chance to outdo them."
@@ -442,7 +442,7 @@
<br><br>\
'I had retired because of senescence brought on by my old age, high-stress lifestyle, and multiple resurrective clonings. As you may know, I recently had a procedure that renders these difficulties obsolete. Hereafter I will continue to control the automated facilities of the Pearl and claim responsibility for the collective action of my followers. Those who oppose my decision may oppose all they want. Feelings do not move mountains. I do. We shall seize the stars in our own hands. May you become who you wish to be, and grind all obstacles to dust, as I have done.'\
<br><br>\
Purportedly, this address was met with a standing ovation from the population of Angessa's Pearl. In a separate dispatch, Martei stated her intention to tour SolGov as a foreign dignitary protected by the Respect for Diplomats Act."
Purportedly, this address was met with a standing ovation from the population of Angessa's Pearl. In a separate dispatch, Martei stated her intention to tour OriCon as a foreign dignitary protected by the Respect for Diplomats Act."
/datum/lore/codex/page/article35
name = "02/07/63 - Vir Gubernatorial Candidate Barred from Breakfast TV"
@@ -505,9 +505,9 @@
<br><br>\
Mason Keldow says, 'People working in orbit say 'Don't go to the surface, Spiders are down there.''\
<br><br>\
Mason Keldow says, 'And apparently there was a big ol' purple one sitting right by a camp we had set up. A giant mother who'd - if I hadn't met that lovely mass of fur and ice instead - would have probably said its <20>hello<6C> in the worst possible way.'\
Mason Keldow says, 'And apparently there was a big ol' purple one sitting right by a camp we had set up. A giant mother who'd - if I hadn't met that lovely mass of fur and ice instead - would have probably said its <20>hello<6C> in the worst possible way.'\
<br><br>\
Mason Keldow says, 'They are a species that prevents anyone from actually working or otherwise making use of all that land. If I were in office, I'd make an effort to clear out the dangerous species that surround the outer regions of Sif <20> relocate them if possible - and use that territory for something productive.'\
Mason Keldow says, 'They are a species that prevents anyone from actually working or otherwise making use of all that land. If I were in office, I'd make an effort to clear out the dangerous species that surround the outer regions of Sif <20> relocate them if possible - and use that territory for something productive.'\
<br><br>\
Mason Keldow says, 'New forms of Transit, new buildings, new jobs.'\
<br><br>\
@@ -553,7 +553,7 @@
/datum/lore/codex/page/article40
name = "02/14/63 - Ultimatum Unmet: War With Almach!"
data = "The Solar Confederate Government has resumed a state of war against the secessionist Almach Association, after 4 months of tense ceasefire. The re-declaration comes after the Association failed to meet requirements set forth by the Colonial Assembly last November, which called for the cessation and destruction of all research that did not meet standards established by the Five Points of Human Sanctity.\
data = "The Orion Confederation Government has resumed a state of war against the secessionist Almach Association, after 4 months of tense ceasefire. The re-declaration comes after the Association failed to meet requirements set forth by the Colonial Assembly last November, which called for the cessation and destruction of all research that did not meet standards established by the Five Points of Human Sanctity.\
<br><br>\
The past few weeks have been marked by an increasing buildup of military forces on the Almach border as it became apparent that Almach had no intention of meeting Sol's demands. At 9am this morning, the deadline was met and initial reports from the frontline suggest relatively little action besides the destruction of pre-existing Almach scout drones that had been placed on the border several months prior. The exact plans of the fleet going forward have not been made public, but civilian traffic to and from the Saint Columbia system has been entirely suspended.\
<br><br>\
@@ -573,7 +573,7 @@
/datum/lore/codex/page/article43
name = "03/06/63 - Dark Triangle Goes Dark!"
data = "As of 0352 this morning, New Reykjavik time, SolGov officials confirmed that all communications coming from the so-called 'Dark Triangle' had ceased. The Dark Triangle is a disputed region of space home to the independent world Natuna, which has maintained a more or less neutral relationship with SolGov for a little more than a decade.\
data = "As of 0352 this morning, New Reykjavik time, OriCon officials confirmed that all communications coming from the so-called 'Dark Triangle' had ceased. The Dark Triangle is a disputed region of space home to the independent world Natuna, which has maintained a more or less neutral relationship with OriCon for a little more than a decade.\
<br><br>\
The announcement gives no cause for the communications blackout, though sources with inside knowledge claim that it was completely unforeseen. Some speculate that Natuna, who became an 'observer nation' of the Almach Association last November, is making a political statement, though experts in the telecommunications field are uncertain as to how such a complete blackout is possible.\
<br><br>\
@@ -583,7 +583,7 @@
name = "03/08/63 - Dark Triangle Overrun By Hegemony"
data = "FTU explorers have re-established exonet communications with the ruling bodies of Natuna and the Dark Triangle. Unfortunately, they also discovered that Natuna's previously autonomous townships have been subsumed into the Moghes Hegemony. \
<br><br>\
Bluespace-lensed telescopes throughout SolGov, including the Vir-based Kara Interstellar Observatory, can once again pick up on tachyon signatures in the region. Traffic has been described as 'lower than usual' and no significant fleet assets are believed to be present in the region, though fixed-placement Hegemony installations now litter the Triangle's major star systems. Systems with significant Hegemony presence include Natuna and Ukupanipo, home to the primitive Uehshad species. Some have speculated that the presence of the Uehshad is the reason for the unexpected Hegemony takeover, though Icarus Front General Secretary Mackenzie West was quick to decry the move as 'an obvious imperial land-grab.'\
Bluespace-lensed telescopes throughout OriCon, including the Vir-based Kara Interstellar Observatory, can once again pick up on tachyon signatures in the region. Traffic has been described as 'lower than usual' and no significant fleet assets are believed to be present in the region, though fixed-placement Hegemony installations now litter the Triangle's major star systems. Systems with significant Hegemony presence include Natuna and Ukupanipo, home to the primitive Uehshad species. Some have speculated that the presence of the Uehshad is the reason for the unexpected Hegemony takeover, though Icarus Front General Secretary Mackenzie West was quick to decry the move as 'an obvious imperial land-grab.'\
<br><br>\
Hegemony diplomats on Luna and elsewhere have been quick to justify their actions. 'The Dark Triangle has been home to various criminal elements for several centuries,' says Aksere Eko Azaris, a major Hegemony diplomat since the early post-war years. 'Neither the Skrell nor the Solar Confederacy have proven any willingness to bring stability to the region. Local governments such as Natuna have actively encouraged piracy, smuggling, and other acts of banditry, instead of making any moves to legitimize themselves. This instability proved detrimental to the health and wellbeing of all living within striking distance of the pirates of Ue-Orsi, and it was deemed unfortunate, but necessary, that we step in and provide the guiding hand by which this region might be brought back into the fold of civilization, as is our duty as sapients.'\
<br><br>\
@@ -597,7 +597,7 @@
name = "03/12/63 - Ue-Orsi Escapes Hegemony Triangle"
data = "The lawless 'Ue-Orsi' flotilla, home to hundreds of thousands of outcast Skrellian pirates, has departed from the Hegemony-controlled Dark Triangle after what appears to be a brief battle with several Unathi warships. The action damaged several important Orsian ships, including their massive and venerable solar array 'Suqot-Thoo'm', a development which is likely to increase the pirates' aggression in the coming months as they search for additional power sources. It is unclear exactly where the flotilla has fled, though best guesses indicate that they are presently in Skrell space, likely near the lightly-patrolled Xe'Teq system. The Moghes Hegemony is in negotiations with several Skrellian states to arrange for military action against their escaped subjects, but little headway has been made thus far.\
<br><br>\
This revelation has added more fuel to already heated Assembly arguments about SolGov response to the Unathi takeover. 'This is a prelude to invasion, nothing more and nothing less,' says New Seoul Representative Collin So-Yung, a noted Iconoclast. 'We must make it absolutely clear to the Hegemony that this is a threat we will not bow to, even in our present state of internal weakness. I suggest we pursue a fair peace with the Association, one where we can keep them as allies against this sort of encroachment instead of shattering our fleets during such a pivotal moment.'\
This revelation has added more fuel to already heated Assembly arguments about OriCon response to the Unathi takeover. 'This is a prelude to invasion, nothing more and nothing less,' says New Seoul Representative Collin So-Yung, a noted Iconoclast. 'We must make it absolutely clear to the Hegemony that this is a threat we will not bow to, even in our present state of internal weakness. I suggest we pursue a fair peace with the Association, one where we can keep them as allies against this sort of encroachment instead of shattering our fleets during such a pivotal moment.'\
<br><br>\
Others took a more nuanced approach, including VGA Governor Bjorn Arielsson. 'What we have here is our punishment for how badly we've treated the people of the Triangle. I don't really see why we should have let the tired old racism of some Qerr-Katish oligarchs stop us from offering aid to their tired and huddled masses, such as it is. And because we have had a full century of ignoring their plight, they were defenceless to resist the Hegemony. I say we fling the doors open, let (the Orsians) settle some rock here, and show the unaligned powers of the galaxy that the Hegemony's way isn't the only way.'\
<br><br>\
@@ -607,7 +607,7 @@
name = "03/26/63 - Almach Routed from Saint Columbia"
data = "The Saint Columbia system has been declared free of Association forces following a renewed SCG offensive in the region. Admiral McMullen of the Saint Columbia garrison - who has reportedly reclaimed his post at the system's naval base despite the facility suffering moderate damage in this week's fighting - says that the last secessionist vessels were driven from the system just over 24 hours ago, and remaining pockets of resistance have been quick to lay down their arms. At least 20 enemy vessels - mostly converted civilian ships - have been confirmed disabled or destroyed in-system, thanks in no small part to the deployment of the state-of-the-art MJOLNIR weapons system.\
<br><br>\
This more aggressive approach to the Almach front comes on the tail of aggressive Hegemony deployments in the Dark Triangle, which SolGov has conceded was 'Immediately threatening, but after some deliberation, has brought some form of policing to a lawless region.'.\
This more aggressive approach to the Almach front comes on the tail of aggressive Hegemony deployments in the Dark Triangle, which OriCon has conceded was 'Immediately threatening, but after some deliberation, has brought some form of policing to a lawless region.'.\
<br><br>\
Despite assurances, this recent action would appear to many to be an effort to quash the Association threat and return fleet forces to the now extended Hegemony border, and some critics of the Almach War have called for a second ceasefire 'In order to focus on the real threat to mankind.'"
@@ -675,7 +675,7 @@
/datum/lore/codex/page/article55
name = "06/29/63 - Morpheus Cyberkinetics To Split Assets"
data = "The Morpheus Cyberkenetics Corporation is to split into two distinct entities operating under a single board of trustees, in light of their Almach branch's apparent involvement in the ongoing war after last month's 'unintentional' corporate drone strikes. Citing 'Severe communications disruptions' between its operations and assets on either side of the cordon since it was put in place last year, the SolGov-side corporation is to become 'Morpheus Sol', retaining most assets and current corporate headquarters, and its Almach counterpart 'Morpheus Shelf', which is to be based out of the administration station MAS Sophia Jr., located in the El system.'\
data = "The Morpheus Cyberkenetics Corporation is to split into two distinct entities operating under a single board of trustees, in light of their Almach branch's apparent involvement in the ongoing war after last month's 'unintentional' corporate drone strikes. Citing 'Severe communications disruptions' between its operations and assets on either side of the cordon since it was put in place last year, the OriCon-side corporation is to become 'Morpheus Sol', retaining most assets and current corporate headquarters, and its Almach counterpart 'Morpheus Shelf', which is to be based out of the administration station MAS Sophia Jr., located in the El system.'\
<br><br>\
The principle victim of the Aetolian coup, Nanotrasen, has seen most of their considerable Almachi investment nationalized by the secessionist government, as has Xion and other major Almachi organizations. Most surviving corporate exclaves have been effectively written off by their parent company for the duration of the conflict, due to the severe difficulties effectively conducting trade across the militarized border. Before today, the sole exception was Morpheus, whose involvement in the secession prevented any seizing of their assets. It seems, however, that even the sardonic positronic corporation is not immune to the difficulties of doing business in the Almach Rim region.\
<br><br>\
@@ -683,7 +683,7 @@
/datum/lore/codex/page/article56
name = "06/30/63 - Almach Leak Confirms 'Super-weapon' in Whythe"
data = "Solar Confederate Government Intelligence has this afternoon confirmed the presence of a so-called 'Super-weapon' in the distant Whythe system, after an apparent intelligence leak was posted to the exonet in the early hours of this morning. According to a spokesperson for the Solar Fleet, the public were not made aware of the super-weapon as the military 'have no reason to believe that the weapon poses any threat to civilian targets within SolGov space at this time, and there is no reason to cause panic with what amounts to the announcement of an Almachi propaganda tool intended to sow discord with bold threats of overwhelming power. This morning's leak achieves nothing but serving the Association's schemes. Keeping this so-called super-weapon - and I hesitate to use that term - a secret seems to have been last on their list of priorities.'\
data = "Orion Confederation Government Intelligence has this afternoon confirmed the presence of a so-called 'Super-weapon' in the distant Whythe system, after an apparent intelligence leak was posted to the exonet in the early hours of this morning. According to a spokesperson for the Solar Fleet, the public were not made aware of the super-weapon as the military 'have no reason to believe that the weapon poses any threat to civilian targets within OriCon space at this time, and there is no reason to cause panic with what amounts to the announcement of an Almachi propaganda tool intended to sow discord with bold threats of overwhelming power. This morning's leak achieves nothing but serving the Association's schemes. Keeping this so-called super-weapon - and I hesitate to use that term - a secret seems to have been last on their list of priorities.'\
<br><br>\
According to the intelligence documents released this morning and widely spread within minutes of upload, the 'super-weapon' is a colossal space-bound structure equipped with 'newly developed bluespace technology', though its exact purpose or capabilities have not been confirmed by either side.\
<br><br>\
@@ -743,7 +743,7 @@
/datum/lore/codex/page/article62
name = "08/07/63 - Almach Pirate Threat Vanishes - Analysts Baffled"
data = "Skrellian Xe'qua pirates operating in the far reaches of the Almach Association since the onset of hostilities last year, have inexplicably gone dark. The pirates, who were under close SolGov surveillance to monitor their impact on Almachi shipping, have drastically dropped in activity and numbers over the last month according to an official report released by the Solar Fleet today. The Fleet is unable to account for the cease in activity, which has now reached levels even lower than their pre-war baseline, as there have been no reports of Almach military operations in the area, nor any signs of decisive battle on the Almach border with pirate space.\
data = "Skrellian Xe'qua pirates operating in the far reaches of the Almach Association since the onset of hostilities last year, have inexplicably gone dark. The pirates, who were under close OriCon surveillance to monitor their impact on Almachi shipping, have drastically dropped in activity and numbers over the last month according to an official report released by the Solar Fleet today. The Fleet is unable to account for the cease in activity, which has now reached levels even lower than their pre-war baseline, as there have been no reports of Almach military operations in the area, nor any signs of decisive battle on the Almach border with pirate space.\
<br><br>\
The drop in activity roughly coincides with the leaked information on an Almach 'Super-weapon' in Whythe, though military sources do not believe that the weapon has been deployed in any capacity at this time. According to Hasan Drust, an expert on Skrellian foreign policy, the 'only feasible explanation (is) major anti-piracy action undertaken by the Skrellian Far Kingdoms', who occupy the space beyond the Xe'qua pirates' known range. The reasoning behind this action now, against pirates who have historically only targeted human space is not entirely clear, though Drust suggests that it may simply be a coincidence as pirates would be a 'trivial issue' for Far Kingdom military might."
@@ -775,7 +775,7 @@
/datum/lore/codex/page/article66
name = "10/01/63 - 'Judgement Day' As Gavel Falls!"
data = "The government of New Xanadu has surrendered to Association invaders following a disastrous relief effort by the Solar Fleet, whose interdiction vessels are believed to have been captured by the invading force. The manoeuvre leaves the bulk of the Sol fleet isolated in the Saint Columbia system - though a breakout is expected - and has led to widespread outrage in the Colonial Assembly. Critics of the war have damned the Fleet for their 'inability to fight a civilian rabble, gene-modded or otherwise' and renewed calls for a peaceful arrangement between the Solar Confederate Government and Association.\
data = "The government of New Xanadu has surrendered to Association invaders following a disastrous relief effort by the Solar Fleet, whose interdiction vessels are believed to have been captured by the invading force. The manoeuvre leaves the bulk of the Sol fleet isolated in the Saint Columbia system - though a breakout is expected - and has led to widespread outrage in the Colonial Assembly. Critics of the war have damned the Fleet for their 'inability to fight a civilian rabble, gene-modded or otherwise' and renewed calls for a peaceful arrangement between the Orion Confederation Government and Association.\
<br><br>\
ISA-5, current spokesperson for the Shadow Coalition has forwarded a motion today to resume discussions with Almachi heads of state, just hours after news of Gavel's surrender broke. The proposal which has yet to gain widespread traction, would call for a new ceasefire, and ISA-5 has stated they 'hope that a new agreement can be made to end the senseless loss of life over the particulars of a foreign government's right to autonomy.'.\
<br><br>\

4
code/modules/maps/talon/talon.dm
View File

@@ -290,7 +290,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/item/storage/belt/security,
/obj/item/radio,
/obj/item/radio/headset/talon,
/obj/item/clothing/accessory/solgov/department/security,
/obj/item/clothing/accessory/oricon/department/security,
/obj/item/clothing/head/helmet/space/void/refurb/marine/talon,
/obj/item/clothing/suit/space/void/refurb/marine/talon,
/obj/item/clothing/shoes/magboots,
@@ -360,7 +360,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/radio,
/obj/item/clothing/under/utility/blue,
/obj/item/clothing/accessory/solgov/specialty/pilot,
/obj/item/clothing/accessory/oricon/specialty/pilot,
/obj/item/clothing/shoes/boots/jackboots,
/obj/item/clothing/shoes/boots/jackboots/toeless,
/obj/item/radio/headset/talon,

2
code/modules/mob/living/carbon/human/species/station/station.dm
View File

@@ -378,7 +378,7 @@
min_age = 18
max_age = 90
blurb = "The Zaddat are an Unathi client race only recently introduced to SolGov space. Having evolved on \
blurb = "The Zaddat are an Unathi client race only recently introduced to OriCon space. Having evolved on \
the high-pressure and post-apocalyptic world of Xohok, Zaddat require an environmental suit called a Shroud \
to survive in usual planetary and station atmospheres. Despite these restrictions, worsening conditions on \
Xohok and the blessing of the Moghes Hegemony have lead the Zaddat to enter human space in search of work \

3
code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm
View File

@@ -96,8 +96,7 @@
\[row\] - New table row.
\[cell\] - New table cell.
\[logo\] - Inserts NT logo image.
\[redlogo\] - Inserts red NT logo image.
\[sglogo\] - Inserts Solgov insignia image."}
\[redlogo\] - Inserts red NT logo image."}
to_chat(usr, help)
return 1

7
code/modules/paperwork/adminpaper.dm
View File

@@ -39,11 +39,8 @@
var/originhash = md5("[origin]")
var/timehash = copytext(md5("[world.time]"),1,10)
var/text = null
var/logo = alert(usr, "Do you want the header of your fax to have a NanoTrasen or SolGov logo?","Fax Logo","NanoTrasen","SolGov")
if(logo == "SolGov")
logo = "sglogo.png"
else
logo = "ntlogo.png"
var/logo = "ntlogo.png"
//TODO change logo based on who you're contacting.
text = "<center><img src = [logo]></br>"
text += "<b>[origin] Quantum Uplink Signed Message</b><br>"

4
code/modules/paperwork/stamps.dm
View File

@@ -65,8 +65,8 @@
name = "cargo rubber stamp"
icon_state = "stamp-cargo"
/obj/item/stamp/solgov
name = "\improper Sol Government rubber stamp"
/obj/item/stamp/oricon
name = "\improper Orion Confederation rubber stamp"
icon_state = "stamp-sg"

8
code/modules/projectiles/ammunition/magazines.dm
View File

@@ -326,8 +326,12 @@
max_ammo = 17
origin_tech = list(TECH_COMBAT = 2, TECH_ILLEGAL = 1)
/obj/item/ammo_magazine/m9mm/large/preban // Sold by traders.
desc = "A large capacity magazine that was built before the SolGov Assault Weapons Ban, so it's legal to own."
/obj/item/ammo_magazine/m9mm/large/licensed // Sold by traders.
desc = "A large capacity magazine produced via a joint NT-Hephaestus license, making it legal to own."
/obj/item/ammo_magazine/m9mm/large/licensed/hp // Hollow Point Version
name = "magazine (9mm hollow-point)"
ammo_type = /obj/item/ammo_casing/a9mm/hp
/obj/item/ammo_magazine/m9mm/empty
initial_ammo = 0

3
code/modules/projectiles/ammunition/magazines_vr.dm
View File

@@ -1,3 +0,0 @@
/obj/item/ammo_magazine/m9mm/large/preban/hp // Hollow Point Version
name = "magazine (9mm hollow-point)"
ammo_type = /obj/item/ammo_casing/a9mm/hp

8
code/modules/projectiles/guns/projectile/pistol.dm
View File

@@ -328,12 +328,12 @@
//Ported this over from the _vr before deletion. Commenting them out because I'm not sure we want these in.
/*
/obj/item/gun/projectile/p92x/large/preban
/obj/item/gun/projectile/p92x/large/licensed
icon_state = "p92x-brown"
magazine_type = /obj/item/ammo_magazine/m9mm/large/preban // Spawns with big magazines that are legal.
magazine_type = /obj/item/ammo_magazine/m9mm/large/licensed // Spawns with big magazines that are legal.
/obj/item/gun/projectile/p92x/large/preban/hp
magazine_type = /obj/item/ammo_magazine/m9mm/large/preban/hp // Spawns with legal hollow-point mag
/obj/item/gun/projectile/p92x/large/licensed/hp
magazine_type = /obj/item/ammo_magazine/m9mm/large/licensed/hp // Spawns with legal hollow-point mag
*/
/obj/item/gun/projectile/p92x/brown

2
code/modules/vore/fluffstuff/custom_clothes.dm
View File

@@ -1701,7 +1701,7 @@ END OF CITADEL CHANGES */
item_state_slots = list(slot_r_hand_str = "aika_coat_mob_r", slot_l_hand_str = "aika_coat_mob_l")
//Burrito Justice: Jayda Wilson
/obj/item/clothing/under/solgov/utility/sifguard/medical/fluff
/obj/item/clothing/under/oricon/utility/sysguard/medical/fluff
desc = "The utility uniform of the Society of Universal Cartographers, made from biohazard resistant material. This is an older issuing of the uniform, with integrated department markings."
icon = 'icons/vore/custom_clothes_vr.dmi'

0
icons/mob/uniform_solgov.dmi → icons/mob/uniform_oricon.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

0
icons/obj/clothing/uniforms_solgov.dmi → icons/obj/clothing/uniforms_oricon.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

12
news_articles/space_magazine_1.html
View File

@@ -10,7 +10,7 @@
<br>
<p>
SPACE Magazine is a new force in Journalism in the 26th Century- bringing news and information to the multitudes of Star Systems settled by Sentient Life,
letting everyone know what<61>s happening across the Stars, millions of miles away. News if first and foremost our forte, but articles over important
letting everyone know what<61>s happening across the Stars, millions of miles away. News if first and foremost our forte, but articles over important
individuals and new developments will also be here in the magazine, which we shall ship out every month with a new issue. This, is our very first issue,
and we hope to continue for many years to come.
</p>
@@ -26,14 +26,14 @@
<h2>Pirates Underestimate Colonial Defenses</h2>
<br>
<p>
This week, a pirate group that has stolen a SolGov Battlecruiser has attempted to commit a raid with it upon a colony world Onaios Prime, in the Onaios
This week, a pirate group that has stolen an OriCon Battlecruiser has attempted to commit a raid with it upon a colony world Onaios Prime, in the Onaios
system. However, it was quickly eradicated along with its escort by a planetside battery of Mass Drivers produced recently by Dawnlight Celestial Defence.
After this incident Dawnlight has registered an influx of demand from other colonies, as their weapons are relatively affordable, registering slight growth
in stock ratings for the first time in 250 years, when the success of Dawnlight even competed with corporations like Hephaestus. We have found a written
account of one of the writers of local news agency, and with their permission are including it in this article.
</p>
<p>
<20>It was almost midnight when I was driving around the AURA 2, a new anti-orbital installation, on my way home from my office, after some overtime. I have
<20>It was almost midnight when I was driving around the AURA 2, a new anti-orbital installation, on my way home from my office, after some overtime. I have
heard of its construction project and have never paid much attention to it, the world of Onaios Prime that I live on has always been only moderately
wealthy, and peaceful... until last night. A loud siren played from the complex's direction, breaking the silence of the night. I stopped my vehicle where
an overhang down to the valley let me look at the platform, from 50 meters above it, and about 300 meters away from it, and I saw it for my first time.
@@ -52,13 +52,13 @@
heard its calling. Every spike, a declaration of freedom. Every thunderblast, a declaration of sovereignty. The Mass Drivers would flash, marking dawn upon
the invaders to signal the humanity made its stand here, and it shall persevere. The warhead that it would expel was our fist that would smite them from
our sky. I did not know who have we fought against at that time, but at that moment, and ever since, I never looked at the night sky the same way again. I
believe that that sky is our home.<2E> -Written by Liun Asitero, Onaios Daily
believe that that sky is our home.<2E> -Written by Liun Asitero, Onaios Daily
</p>
<i> Written by Lucas Shiito </i>
<br><br>
<h2>Brinkburn Refugees and Sapient<6E>s Rights</h2>
<h2>Brinkburn Refugees and Sapient<6E>s Rights</h2>
<br>
<p>
One of Nyx's planets, Brinkburn, has had a catastrophe happen in form of a meteor storm three days ago. Nyx has lashed out with a solar corona that, while
@@ -132,4 +132,4 @@
point this year, stations and ships in the Nyx System will be subjected to the largest migration of Carp and Pike that has ever been seen, and it may cause
serious damage to interests in the system.
</p>
<i>Written by Peggy Re<52>saih</i>
<i>Written by Peggy Re<52>saih</i>

17
vorestation.dme
View File

@@ -384,7 +384,7 @@
#include "code\datums\outfits\military\fleet.dm"
#include "code\datums\outfits\military\marines.dm"
#include "code\datums\outfits\military\military.dm"
#include "code\datums\outfits\military\sifguard.dm"
#include "code\datums\outfits\military\sysguard.dm"
#include "code\datums\repositories\ammomaterial.dm"
#include "code\datums\repositories\cameras.dm"
#include "code\datums\repositories\crew.dm"
@@ -1770,16 +1770,14 @@
#include "code\modules\clothing\head\flowercrowns.dm"
#include "code\modules\clothing\head\hardhat.dm"
#include "code\modules\clothing\head\helmet.dm"
#include "code\modules\clothing\head\helmet_vr.dm"
#include "code\modules\clothing\head\hood.dm"
#include "code\modules\clothing\head\jobs.dm"
#include "code\modules\clothing\head\misc.dm"
#include "code\modules\clothing\head\misc_special.dm"
#include "code\modules\clothing\head\misc_vr.dm"
#include "code\modules\clothing\head\oricon.dm"
#include "code\modules\clothing\head\pilot_helmet.dm"
#include "code\modules\clothing\head\soft_caps.dm"
#include "code\modules\clothing\head\solgov.dm"
#include "code\modules\clothing\head\solgov_vr.dm"
#include "code\modules\clothing\masks\boxing.dm"
#include "code\modules\clothing\masks\breath.dm"
#include "code\modules\clothing\masks\gasmask.dm"
@@ -1833,15 +1831,13 @@
#include "code\modules\clothing\spacesuits\void\wizard.dm"
#include "code\modules\clothing\spacesuits\void\zaddat.dm"
#include "code\modules\clothing\suits\armor.dm"
#include "code\modules\clothing\suits\armor_vr.dm"
#include "code\modules\clothing\suits\bio.dm"
#include "code\modules\clothing\suits\hooded.dm"
#include "code\modules\clothing\suits\hooded_vr.dm"
#include "code\modules\clothing\suits\jobs.dm"
#include "code\modules\clothing\suits\labcoat.dm"
#include "code\modules\clothing\suits\miscellaneous.dm"
#include "code\modules\clothing\suits\solgov.dm"
#include "code\modules\clothing\suits\solgov_vr.dm"
#include "code\modules\clothing\suits\oricon.dm"
#include "code\modules\clothing\suits\storage.dm"
#include "code\modules\clothing\suits\utility.dm"
#include "code\modules\clothing\suits\utility_vr.dm"
@@ -1853,14 +1849,12 @@
#include "code\modules\clothing\under\color.dm"
#include "code\modules\clothing\under\imperial_vr.dm"
#include "code\modules\clothing\under\miscellaneous.dm"
#include "code\modules\clothing\under\miscellaneous_vr.dm"
#include "code\modules\clothing\under\nanotrasen_vr.dm"
#include "code\modules\clothing\under\oricon.dm"
#include "code\modules\clothing\under\oricon_cit.dm"
#include "code\modules\clothing\under\pants.dm"
#include "code\modules\clothing\under\shiny_vr.dm"
#include "code\modules\clothing\under\shorts.dm"
#include "code\modules\clothing\under\solgov.dm"
#include "code\modules\clothing\under\solgov_cit.dm"
#include "code\modules\clothing\under\solgov_vr.dm"
#include "code\modules\clothing\under\syndicate.dm"
#include "code\modules\clothing\under\accessories\accessory.dm"
#include "code\modules\clothing\under\accessories\armband.dm"
@@ -3096,7 +3090,6 @@
#include "code\modules\projectiles\pins.dm"
#include "code\modules\projectiles\projectile.dm"
#include "code\modules\projectiles\ammunition\magazines.dm"
#include "code\modules\projectiles\ammunition\magazines_vr.dm"
#include "code\modules\projectiles\ammunition\magic.dm"
#include "code\modules\projectiles\ammunition\magnetic.dm"
#include "code\modules\projectiles\ammunition\rounds.dm"