Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
88e4cad
and so, it begins!
Addust Jun 26, 2023
2307c7e
q
Addust Jun 26, 2023
244ab90
wergqw
Addust Jun 27, 2023
97a0af1
Update icemoon_surface_syndicate.dmm
Addust Jun 30, 2023
bf4feec
FUCK MDB!!
Addust Jun 30, 2023
6344e22
due to MDB we cannot have the cameras, so the shed is now binoculars …
Addust Jun 30, 2023
d79a2a0
rtj5weje
Addust Jul 1, 2023
be55ee6
4e5rhw45h4wr
Addust Jul 1, 2023
fc32ed7
Merge branch 'yogstation13:master' into siberian-syndicate
Addust Jul 2, 2023
a9cea5a
get employed
Addust Jul 2, 2023
c908e8b
the great role update! with new jobs and shit! it works better!
Addust Jul 3, 2023
2841881
fuck
Addust Jul 3, 2023
09eafe8
rth4whwerg
Addust Jul 3, 2023
60b3b0a
trherh
Addust Jul 4, 2023
a5578d7
rgwergw
Addust Jul 10, 2023
d2dfbeb
eryu5weu
Addust Jul 10, 2023
dbf7204
gherthrsthd
Addust Jul 11, 2023
964dab0
noise
Addust Jul 13, 2023
67b51c0
We're outta draft, bois.
Addust Jul 16, 2023
2170a82
Merge branch 'yogstation13:master' into siberian-syndicate
Addust Jul 16, 2023
c92c84b
stop FAILING MY TESTS you fucking NERD
Addust Jul 16, 2023
450b87b
gbfgifyutvtiguyfuyfhvyffiytfyug
Addust Jul 16, 2023
d28a06e
aaaaaaaaaaaaaaa
Addust Jul 16, 2023
24389a2
fuck your test failures, FISH!!!
Addust Jul 16, 2023
930e7c9
hallwayening part 2
Addust Jul 17, 2023
aacc513
captain's toolbox hurr durr
Addust Jul 17, 2023
69ccd86
Merge branch 'yogstation13:master' into siberian-syndicate
Addust Jul 17, 2023
784d5db
erghwrtjkrtyhjrdtjnftghhertsg5ertyuh
Addust Jul 17, 2023
d475bdf
yhujtydj
Addust Jul 17, 2023
4d75308
fuk
Addust Jul 18, 2023
fc35ce7
tydkyufgkhj
Addust Jul 18, 2023
eb75149
rthr
Addust Jul 21, 2023
7d7cb17
fvtyuiktyufk
Addust Jul 23, 2023
2e97fda
Merge branch 'yogstation13:master' into siberian-syndicate
Addust Jul 23, 2023
43cf2a5
Merge branch 'yogstation13:master' into siberian-syndicate
Addust Jul 24, 2023
61ed2b3
fg976tg897t8967t7868y9iku6807y097y-97y97
Addust Jul 24, 2023
59cd370
robo thing
Addust Jul 24, 2023
dc4318e
a
Addust Jul 27, 2023
11e96ae
Merge branch 'yogstation13:master' into siberian-syndicate
Addust Jul 27, 2023
990bac9
Merge branch 'yogstation13:master' into siberian-syndicate
Addust Jul 29, 2023
3d9d612
a
Addust Jul 30, 2023
20ebe9d
90=[]90uj'io';iho;
Addust Jul 30, 2023
5c76f74
A
Addust Jul 30, 2023
de04cc2
yhuioyg7i6tf678y789y689
Addust Jul 30, 2023
ca9b17f
tfctygjfcyuf
Addust Jul 30, 2023
9df2a95
you can just move a single thing thats actually fucking revolutionary…
Addust Jul 31, 2023
0f5955a
i hate test failures and this aint gonna fix SHIT but here have some …
Addust Jul 31, 2023
7d0c35b
test to see if xenobio caused the test failure, stand by
Addust Aug 16, 2023
31a0201
okay, what about no cameras?
Addust Aug 16, 2023
20d2f8c
Well fuck me.
Addust Aug 16, 2023
903c123
eh
Addust Aug 16, 2023
00612a8
Merge branch 'yogstation13:master' into siberian-syndicate
Addust Aug 16, 2023
49f428b
h
Addust Aug 16, 2023
c8794b9
oh god yes
Addust Aug 16, 2023
c44a576
huehueuhe
Addust Aug 17, 2023
4c6db89
guh
Addust Aug 18, 2023
4f1cf9a
ok nerd
Addust Aug 22, 2023
55804aa
catches it
Addust Aug 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12,333 changes: 12,333 additions & 0 deletions _maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions code/datums/ruins/icemoon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
description = "A small wooden inn with food, drinks, and a place to rest, all maintained by the innkeeper."
suffix = "icemoon_surface_inn.dmm"

/datum/map_template/ruin/icemoon/syndicate_icemoon
name = "Syndicate Icemoon Research Outpost"
id = "synd_research"
description = "A small Syndicate research outpost in the icy wastes, sealed off from the outside."
suffix = "icemoon_surface_syndicate.dmm"

// above and below ground together

/datum/map_template/ruin/icemoon/mining_site
Expand Down
38 changes: 38 additions & 0 deletions code/game/area/areas/ruins/icemoon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,41 @@
/area/ruin/powered/inn/shed
name = "Inn Shed"
icon_state = "dk_yellow"

/area/ruin/syndicate_icemoon
name = "Syndicate Research Outpost"
icon_state = "dk_yellow"

/area/ruin/syndicate_icemoon/security
name = "Syndicate Research Outpost Security"

/area/ruin/syndicate_icemoon/research
name = "Syndicate Research Outpost Research Wing"

/area/ruin/syndicate_icemoon/hallway
name = "Syndicate Research Outpost Central Hallway"

/area/ruin/syndicate_icemoon/command
name = "Syndicate Research Outpost Command"

/area/ruin/syndicate_icemoon/engine
name = "Syndicate Research Outpost Engineering"

/area/ruin/syndicate_icemoon/dorms
name = "Syndicate Research Outpost Dormitories"

/area/ruin/syndicate_icemoon/canteen
name = "Syndicate Research Outpost Canteen"

/area/ruin/syndicate_icemoon/medical
name = "Syndicate Research Outpost Medical Bay"

/area/ruin/syndicate_icemoon/warehouse
name = "Syndicate Research Outpost Warehouse"

/area/ruin/syndicate_icemoon/shed
name = "Syndicate Research Outpost Shed"

/area/ruin/syndicate_icemoon/xenobio
name = "Syndicate Research Outpost Xenobiology"
xenobiology_compatible = TRUE
Original file line number Diff line number Diff line change
Expand Up @@ -386,9 +386,13 @@
build_path = /obj/machinery/computer/robotics

/obj/item/circuitboard/computer/xenobiology
name = "circuit board (Xenobiology Console)"
name = "Xenobiology Console (Computer Board)"
icon_state = "science"
build_path = /obj/machinery/computer/camera_advanced/xenobio

/obj/item/circuitboard/computer/xenobiology/syndicateicemoon
name = "Syndicate Xenobiology Console (Computer Board)"
build_path = /obj/machinery/computer/camera_advanced/xenobio/syndicateicemoon

/obj/item/circuitboard/computer/shuttle/flight_control
name = "Shuttle Flight Control (Computer Board)"
Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,15 @@
/obj/item/storage/box/firingpins/PopulateContents()
for(var/i in 1 to 5)
new /obj/item/firing_pin(src)

/obj/item/storage/box/firingpins/syndicate
name = "box of syndicate firing pins"
desc = "A box full of Syndicate-issue secure firing pins, to allow newly-developed firearms to operate."
illustration = "id"

/obj/item/storage/box/firingpins/PopulateContents()
for(var/i in 1 to 5)
new /obj/item/firing_pin/implant/pindicate(src) //why did you fucks name it pindicate just name it syndicate its not funny at all

/obj/item/storage/box/secfiringpins
name = "box of mindshield firing pins"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,12 @@
new /obj/item/storage/box/smart_metal_foam(src)
for(var/i in 1 to 3)
new /obj/item/rcd_ammo(src)

/obj/structure/closet/secure_closet/syndicate //for syndicate ruins where the crew's shit needs to at least take 5 seconds to steal
name = "armory closet"
desc = "A secure armory closet."
req_access = ACCESS_SYNDICATE
icon_state = "syndicate"

/obj/structure/closet/secure_closet/syndicate/captain //when i eventually redesign the nukeops base the commander's beret goes here
req_access = ACCESS_SYNDICATE_LEADER
98 changes: 98 additions & 0 deletions code/game/objects/structures/ghost_role_spawners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,104 @@
mask = /obj/item/clothing/mask/cigarette/cigar/havana
glasses = /obj/item/clothing/glasses/thermal/eyepatch

//Icemoon Syndicate. Players become research agents working under a Syndicate research station.
/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate //generic version
name = "Syndicate Outpost Agent"
short_desc = "You are an agent at the Syndicate icemoon outpost."
flavour_text = "You are meant to work within the outpost and may take any role within the base you see fit."
important_info = "Do not abandon the base or give supplies to NT employees under any circumstances."
outfit = /datum/outfit/syndicate_empty/icemoon_base
assignedrole = "Icemoon Syndicate"

/datum/outfit/syndicate_empty/icemoon_base
name = "Generic Syndicate Icemoon Outpost Agent"
uniform = /obj/item/clothing/under/syndicate/coldres
suit = /obj/item/clothing/suit/armor/vest
l_pocket = /obj/item/gun/ballistic/automatic/pistol
r_pocket = /obj/item/tank/internals/emergency_oxygen/double
mask = /obj/item/clothing/mask/gas/syndicate
id = /obj/item/card/id/syndicate/anyone

/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/security
name = "Syndicate Outpost Security Officer"
short_desc = "You are a security officer at the Syndicate icemoon outpost."
flavour_text = "Protect the outpost at all costs and prevent its destruction by any means necessary."
important_info = "Do not abandon the base or give supplies to NT employees under any circumstances."
outfit = /datum/outfit/syndicate_empty/icemoon_base/security

/datum/outfit/syndicate_empty/icemoon_base/security
name = "Syndicate Icemoon Outpost Security Guard"
r_hand = /obj/item/gun/ballistic/automatic/c20r/ultrasecure //get fucked in every single comprehensible way.
head = /obj/item/clothing/head/helmet/swat
mask = /obj/item/clothing/mask/gas //i want them to look like the generic operative NPC
belt = /obj/item/storage/belt/security/full //take like one guy alive
glasses = /obj/item/clothing/glasses/hud/security/sunglasses //identify the job of whoever the fuck is breaking in at a glance

/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/sci
name = "Syndicate Outpost Researcher"
short_desc = "You are a researcher at the Syndicate icemoon outpost."
flavour_text = "Perform research for the sake of the Syndicate and advance technology."
important_info = "Do not abandon the base or give supplies to NT employees under any circumstances."
outfit = /datum/outfit/syndicate_empty/icemoon_base/scientist

/datum/outfit/syndicate_empty/icemoon_base/scientist
name = "Syndicate Icemoon Outpost Scientist"
r_hand = /obj/item/gun/ballistic/rifle/sniper_rifle/ultrasecure //get fucked in every single comprehensible way.
suit = /obj/item/clothing/suit/toggle/labcoat/science
accessory = /obj/item/clothing/accessory/armband/science
glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses/rd //it's a syndicate nerd

/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/engineer
name = "Syndicate Outpost Engineer"
short_desc = "You are an engineer at the Syndicate icemoon outpost."
flavour_text = "Maintain and upgrade the base's systems and equipment."
important_info = "Do not abandon the base or give supplies to NT employees under any circumstances."
outfit = /datum/outfit/syndicate_empty/icemoon_base/engineer

/datum/outfit/syndicate_empty/icemoon_base/engineer
name = "Syndicate Icemoon Outpost Engineer"
belt = /obj/item/storage/belt/utility/chief/full //mainly based off the fact that the syndie station ruin that's TM'd at the time of the ruin gives its engis this
suit = /obj/item/clothing/suit/hazardvest
head = /obj/item/clothing/head/hardhat
accessory = /obj/item/clothing/accessory/armband/engine
glasses = /obj/item/clothing/glasses/meson/sunglasses/ce

/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/medic
name = "Syndicate Outpost Doctor"
short_desc = "You are a medical officer at the Syndicate icemoon outpost."
flavour_text = "Provide medical aid to the crew of the outpost and keep them all alive."
important_info = "Do not abandon the base or give supplies to NT employees under any circumstances."
outfit = /datum/outfit/syndicate_empty/icemoon_base/medic

/datum/outfit/syndicate_empty/icemoon_base/medic
name = "Syndicate Icemoon Outpost Medical Officer"
r_hand = /obj/item/storage/firstaid/hypospray/deluxe/cmo //rapid un-hurt
suit = /obj/item/clothing/suit/toggle/labcoat/md //I AM A SURGEON!!
glasses = /obj/item/clothing/glasses/hud/health/sunglasses/cmo //rapid hurt and chemical identification
accessory = /obj/item/clothing/accessory/armband/medblue

/obj/effect/mob_spawn/human/syndicate/icemoon_syndicate/commander
name = "Syndicate Outpost Commander"
short_desc = "You are the commander of the Syndicate icemoon outpost."
flavour_text = "Direct the agents working under your command to operate the base, and keep it secure. If the situation gets dire, activate the emergency self-destruct located in the control room."
important_info = "Do not abandon the base or give supplies to NT employees under any circumstances."
outfit = /datum/outfit/syndicate_empty/icemoon_base/captain
id_access_list = list(150,151)

/datum/outfit/syndicate_empty/icemoon_base/captain
name = "Syndicate Icemoon Outpost Commander"
glasses = /obj/item/clothing/glasses/sunglasses/big //big man get big sunglasses
ears = /obj/item/radio/headset/syndicate/alt/leader //big voice
accessory = /obj/item/clothing/accessory/medal/gold //because the captain one is NT brand
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
l_pocket = /obj/item/melee/transforming/energy/sword/saber/red
mask = /obj/item/clothing/mask/chameleon/gps //best one to give a GPS is this guy because he has a fast-firing 2-shot kill to defend his home with
head = /obj/item/clothing/head/HoS/beret/syndicate
back = /obj/item/storage/backpack/satchel/leather //LUXURY AT ITS FINEST
suit_store = /obj/item/gun/ballistic/revolver
belt = /obj/item/storage/belt/sabre //ceremonial shamnk
backpack_contents = list(/obj/item/modular_computer/tablet/preset/syndicate=1, /obj/item/ammo_box/a357=2, /obj/item/melee/classic_baton/telescopic=1)

//Ancient cryogenic sleepers. Players become NT crewmen from a hundred year old space station, now on the verge of collapse.
/obj/effect/mob_spawn/human/oldsec
name = "old cryogenics pod"
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/guns/ballistic/automatic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
/obj/item/gun/ballistic/automatic/c20r/unrestricted
pin = /obj/item/firing_pin

/obj/item/gun/ballistic/automatic/c20r/ultrasecure
pin = /obj/item/firing_pin/fucked

/obj/item/gun/ballistic/automatic/c20r/Initialize(mapload)
. = ..()
update_appearance(UPDATE_ICON)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/pins.dm
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@
// fun pin
// for when you need a gun to not be fired by anyone else ever
/obj/item/firing_pin/fucked
name = "Syndicate Ultrasecure Firing Pin"
desc = "Get fuuuuuuuuucked."
name = "syndicate ultrasecure firing pin"
desc = "Get fucked!"
selfdestruct = TRUE

/obj/item/firing_pin/fucked/pin_auth(mob/living/user)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/research/xenobiology/xenobio_camera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -468,3 +468,9 @@
X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
qdel(M)
to_chat(C, "[X] now has [X.monkeys] monkeys available.")

/obj/machinery/computer/camera_advanced/xenobio/syndicateicemoon
name = "slime management console"
desc = "A computer used for remotely handling slimes."
networks = list("synd_icemoon_xenobio")
circuit = /obj/item/circuitboard/computer/xenobiology/syndicateicemoon