Skip to content

Commit

Permalink
Merge pull request #336 from ItsMeJaba/stealing-from-minutemen
Browse files Browse the repository at this point in the history
add: Cepheus convertation to SolGov
  • Loading branch information
MysticalFaceLesS authored Mar 11, 2024
2 parents e77aaad + d17fab2 commit 6e47e67
Show file tree
Hide file tree
Showing 9 changed files with 5,235 additions and 22 deletions.
5,099 changes: 5,099 additions & 0 deletions _maps/_mod_celadon/shuttles/solgov/solgov_cepheus.dmm

Large diffs are not rendered by default.

49 changes: 49 additions & 0 deletions _maps/configs/solgov_cepheus.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Cepheus-class Patrool Corvette",
"prefix": "BSFSV",
"namelists": [
"SOLGOV",
"SPACE",
"WEAPONS",
"NATURAL"
],
"map_short_name": "Cepheus-class",
"description": "Корвет класса 'Cepheus' является патрульным судном Солнечной Федерации, предназначенный для поддержания порядка на территории планет NE-24774. Дополнительно оснащен роботехнической лабораторией в целях развертывания дополнительных наземных сил и оказания универсальной поддержки.",
"tags": [
"Engineering",
"Mining",
"Robotics",
"Combat"],
"map_path": "_maps/_mod_celadon/shuttles/solgov/solgov_cepheus.dmm",
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/solgov/captain",
"officer": true,
"slots": 1
},
"Ship Engineer": {
"outfit": "/datum/outfit/job/solgov/engineer",
"slots": 1
},
"Sonnensöldner": {
"outfit": "/datum/outfit/job/solgov/sonnensoldner",
"slots": 2
},
"Exosuit Operator": {
"outfit": "/datum/outfit/job/solgov/sonnensoldner/pilot",
"slots": 2
},
"Mechanical Technician Officer": {
"outfit": "/datum/outfit/job/solgov/scientist/roboticist",
"slots": 1
},
"Scribe": {
"outfit": "/datum/outfit/job/solgov/assistant",
"slots" : 1
}

},
"enabled": true
}
4 changes: 4 additions & 0 deletions code/game/objects/effects/decals/turfdecal/flooring_decals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,10 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
name = "techfloor corner"
icon_state = "techfloororange_corners"

/obj/effect/turf_decal/techfloor/line
name = "techfloor lines"
icon_state = "techfloor_lines"

/obj/effect/turf_decal/techfloor/hole
name = "hole left"
icon_state = "techfloor_hole_left"
Expand Down
11 changes: 0 additions & 11 deletions code/game/objects/structures/crates_lockers/closets/wallmount.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,3 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "generic_wall"
icon_door = "generic_wall"

// Some preset stuff

/obj/structure/closet/secure_closet/captains/vanguard/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_state = "solgov_wall"
icon_door = "solgov_wall"
Binary file modified icons/turf/decals.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//Пилот мехов солгова

/obj/structure/closet/secure_closet/security/solgov/pilot
name = "pilot's locker"

/obj/structure/closet/secure_closet/security/solgov/pilot/PopulateContents()
new /obj/item/clothing/under/solgov/formal(src)
new /obj/item/clothing/under/solgov/dress(src)
new /obj/item/clothing/under/solgov(src)
new /obj/item/clothing/shoes/workboots(src)
new /obj/item/clothing/gloves/combat(src)
new /obj/item/radio/headset/solgov/alt(src)
new /obj/item/radio{icon_state = "sec_radio"}(src)
new /obj/item/clothing/head/beret/solgov (src)
new /obj/item/clothing/accessory/holster (src)
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/obj/structure/closet/secure_closet/captains/vanguard/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_state = "solgov_wall"
icon_door = "solgov_wall"

/obj/structure/closet/secure_closet/security/solgov/pilot/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_state = "sec_wall"
38 changes: 38 additions & 0 deletions mod_celadon/code/modules/clothing/outfits/factions/solgov.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Ученые

/datum/outfit/job/solgov/scientist
name = "SolGov - Scientific Officer"
jobtype = /datum/job/scientist
job_icon = "scientist"

id = /obj/item/card/id/solgov
ears = /obj/item/radio/headset/headset_sci
uniform = /obj/item/clothing/under/solgov/formal
shoes = /obj/item/clothing/shoes/laceup
suit = /obj/item/clothing/suit/toggle/labcoat/science
dcoat = /obj/item/clothing/suit/hooded/wintercoat/science

backpack = /obj/item/storage/backpack/science
satchel = /obj/item/storage/backpack/satchel/tox
courierbag = /obj/item/storage/backpack/messenger/tox

/datum/outfit/job/solgov/scientist/roboticist
name = "SolGov - Mechanical Technician Officer"
job_icon = "roboticist"
jobtype = /datum/job/roboticist

uniform = /obj/item/clothing/under/rank/rnd/roboticist
suit = /obj/item/clothing/suit/longcoat/robowhite

backpack_contents = list(/obj/item/weldingtool/hugetank)

// Пилот меха

/datum/outfit/job/solgov/sonnensoldner/pilot
name = "SolGov - Exosuit Operator"
jobtype = /datum/job/officer
job_icon = "sonnensoldner"

head = /obj/item/clothing/head/solgov
glasses = /obj/item/clothing/glasses/sunglasses
suit = /obj/item/clothing/suit/jacket/leather
25 changes: 14 additions & 11 deletions shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3493,36 +3493,39 @@
#include "mod_celadon\code\game\newscaster.dm"
#include "mod_celadon\code\game\say.dm"
#include "mod_celadon\code\game\machinery\telecomms\broadcasting.dm"
#include "mod_celadon\code\game\mecha\mecha_wreckage.dm"
#include "mod_celadon\code\game\mecha\combat\durand.dm"
#include "mod_celadon\code\game\mecha\combat\gygax.dm"
#include "mod_celadon\code\game\mecha\equipment\tools\work_tools.dm"
#include "mod_celadon\code\game\mecha\medical\odysseus.dm"
#include "mod_celadon\code\game\mecha\working\ripley.dm"
#include "mod_celadon\code\game\objects\items\aifactionlaws.dm"
#include "mod_celadon\code\game\objects\items\fuelcell.dm"
#include "mod_celadon\code\game\objects\items\syndicateventkits.dm"
#include "mod_celadon\code\game\objects\items\storage\belt.dm"
#include "mod_celadon\code\game\objects\machinery\reactor.dm"
#include "mod_celadon\code\game\objects\structures\eclipse_decoration.dm"
#include "mod_celadon\code\game\objects\structures\crates_lockers\closets\secure\security.dm"
#include "mod_celadon\code\game\objects\structures\crates_lockers\closets\wallmount.dm"
#include "mod_celadon\code\modules\cargo\packs\mechs.dm"
#include "mod_celadon\code\modules\clothing\suits\armor.dm"
#include "mod_celadon\code\modules\clothing\suits\syndicateoldsuit.dm"
#include "mod_celadon\code\modules\clothing\outfits\factions\solgov.dm"
#include "mod_celadon\code\modules\mining\event_coin.dm"
#include "mod_celadon\code\modules\mob\emote_panel.dm"
#include "mod_celadon\code\modules\mob\dead\new_player\sprite_accessories\ipc.dm"
#include "mod_celadon\code\modules\mob\living\living.dm"
#include "mod_celadon\code\modules\mob\living\living_defines.dm"
#include "mod_celadon\code\modules\mob\living\living_say.dm"
#include "mod_celadon\code\modules\mob\living\carbon\human\human.dm"
#include "mod_celadon\code\modules\projectiles\guns\ballistic\revolver.dm"
#include "mod_celadon\code\modules\vending\pizzamat.dm"
#include "mod_celadon\code\game\mecha\mecha_wreckage.dm"
#include "mod_celadon\code\game\mecha\combat\durand.dm"
#include "mod_celadon\code\game\mecha\combat\gygax.dm"
#include "mod_celadon\code\game\mecha\equipment\tools\work_tools.dm"
#include "mod_celadon\code\game\mecha\medical\odysseus.dm"
#include "mod_celadon\code\game\mecha\working\ripley.dm"
#include "mod_celadon\code\modules\cargo\packs\mechs.dm"
#include "mod_celadon\code\modules\mob\living\simple_animal\friendly\cat.dm"
#include "mod_celadon\code\modules\mob\living\simple_animal\friendly\fox.dm"
#include "mod_celadon\code\modules\projectiles\guns\ballistic\revolver.dm"
#include "mod_celadon\code\modules\research\designs.dm"
#include "mod_celadon\code\modules\research\designs\mechfabricator_designs.dm"
#include "mod_celadon\code\modules\vending\pizzamat.dm"
#include "mod_celadon\updates\SlightPvEOverhaul\achievement_theinnerhell\theinnerhell.dm"
#include "mod_celadon\updates\SlightPvEOverhaul\antifauna_bullets\baneoffauna.dm"
#include "mod_celadon\updates\SlightPvEOverhaul\elite_pandora\wizardconstructs.dm"
#include "mod_celadon\updates\SlightPvEOverhaul\elite_pandora\pandora.dm"
#include "mod_celadon\updates\SlightPvEOverhaul\achievement_theinnerhell\theinnerhell.dm"
#include "mod_celadon\updates\SlightPvEOverhaul\elite_pandora\wizardconstructs.dm"
// END_INCLUDE

0 comments on commit 6e47e67

Please sign in to comment.