cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Modular] Yet even MORE DS-1 Tweaks. (#3316)

Browse Source 
* fucking nice

* BEEG update

* pog

* feex

* Update assaultops_spawners.dm

* feex

* Revert "feex"

This reverts commit 7bd795b78676995dfe929a0a085a43fce62f7a88.

* feex

* Update CentCom_skyrat_z2.dmm

* aaaa

* some lights

* Update CentCom_skyrat_z2.dmm

* small pet feex

* [TEMP?] removes easter egg

* [TEMP?] Tweaks Prison to remove some mapedit vars

* Update CentCom_skyrat_z2.dmm

* Revert "[TEMP?] Tweaks Prison to remove some mapedit vars"

This reverts commit 319e0939a989f93f519ef3bd8dc4100a8db645f6.

* Revert "Update CentCom_skyrat_z2.dmm"

This reverts commit b55d4a91ac9ddcd382d21aa380402c716d78d080.

* Revert "[TEMP?] removes easter egg"

This reverts commit c3315d5d3bfac93e39c8e8d49f491579dd061867.

* changes water/overlay to just water

* forgot one pool

* Update CentCom_skyrat_z2.dmm
This commit is contained in:
BluBerry016
2021-02-15 20:14:21 +00:00
committed by GitHub
parent 96b2a2724f
commit 9547140f4a
4 changed files with 11427 additions and 8460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -234,3 +234,4 @@ tools/LinuxOneShot/TGS_Logs
# Common build tooling
!/tools/build
tgui/public/tgui-common.bundle.js
_maps/map_files/generic/CentCom_skyrat_z2.dmm
+11303 -8448
View File
File diff suppressed because it is too large Load Diff
modular_skyrat/modules/assaultops/code/assaultops_misc.dm
+6
View File
@@ -123,3 +123,9 @@
/obj/item/radio/headset/assault
keyslot = new /obj/item/encryptionkey/headset_assault
/obj/item/radio/headset/assault/command
name = "ds-1 command headset"
desc = "The headset of the boss. Or maybe his boss."
keyslot = new /obj/item/encryptionkey/headset_assault
command = TRUE
modular_skyrat/modules/assaultops/code/assaultops_spawners.dm
+117 -12
View File
@@ -18,7 +18,7 @@
important_info = "Admin-help before you provoke the Syndicate."
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
outfit = /datum/outfit/prisoner
outfit = /datum/outfit/assops/prisoner
roundstart = FALSE
permanent = FALSE
death = FALSE
@@ -26,16 +26,25 @@
any_station_species = TRUE
excluded_gamemodes = list(/datum/game_mode/assaultops)
/datum/outfit/assops/prisoner
name = "Syndicate Prisoner"
uniform = /obj/item/clothing/under/rank/prisoner
shoes = /obj/item/clothing/shoes/sneakers/orange
id = /obj/item/card/id/prisoner/syndicate
/obj/item/card/id/prisoner/syndicate
assignment = "Syndicate Prisoner"
/obj/effect/mob_spawn/human/syndicate/assops/prison_guard
name = "Syndicate Prison Guard"
short_desc = "You are a prison guard aboard the Syndicate facility DS-1."
name = "Syndicate Brig Officer"
short_desc = "You are a brig officer aboard the Syndicate facility DS-1."
flavour_text = "Your job is to keep the prisoners in check and ensure they do not cause trouble. Patrol the prison, DO NOT TAKE ITEMS FROM THE ARMORY."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives."
outfit = /datum/outfit/syndicate_empty/prison_guard
excluded_gamemodes = list(/datum/game_mode/assaultops)
/datum/outfit/syndicate_empty/prison_guard
name = "Syndicate Prison Guard"
name = "Syndicate Brig Officer"
head = /obj/item/clothing/head/helmet/swat
suit = /obj/item/clothing/suit/armor/bulletproof
uniform = /obj/item/clothing/under/syndicate
@@ -55,8 +64,8 @@
assignment = "Brig Officer"
/obj/effect/mob_spawn/human/syndicate/assops/prison_warden
name = "Syndicate Prison Warden"
short_desc = "You are a prison warden aboard the Syndicate facility DS-1."
name = "Syndicate Master At Arms"
short_desc = "You are a Master At Arms aboard the Syndicate facility DS-1."
flavour_text = "Your job is to oversee facility operations and ensure a smooth running prison. You deal with executions and sentencing."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives."
outfit = /datum/outfit/syndicate_empty/prison_warden
@@ -64,7 +73,7 @@
/datum/outfit/syndicate_empty/prison_warden
name = "Syndicate Prison Warden"
name = "Syndicate Master At Arms"
head = /obj/item/clothing/head/hos/beret/syndicate
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
uniform = /obj/item/clothing/under/syndicate
@@ -106,14 +115,14 @@
assignment = "Syndicate Staff"
/obj/effect/mob_spawn/human/syndicate/assops/syndicate_assistant
name = "Syndicate Assistant"
short_desc = "You are an assistant aboard the Syndicate facility DS-1."
name = "Syndicate Assistant" //Changing this to 'Syndicate Operative' is a no go, that's nukies.
short_desc = "You are an operative aboard the Syndicate facility DS-1."
flavour_text = "Your job is NOT combat, unless the assault team requires it. Otherwise you are simply there to assist the guards and warden. Or relax."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/syndicate_assistant
/datum/outfit/syndicate_empty/syndicate_assistant
name = "Syndicate Assistant"
name = "Syndicate Assistant"//Ditto
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
@@ -126,14 +135,14 @@
assignment = "Operative"
/obj/effect/mob_spawn/human/syndicate/assops/syndicate_scientist
name = "Syndicate Scientist"
name = "Syndicate Researcher"
short_desc = "You are a scientist aboard the Syndicate facility DS-1."
flavour_text = "Your job is that of research and development! You should further your scientific research and utilise the given tools."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/syndicate_scientist
/datum/outfit/syndicate_empty/syndicate_scientist
name = "Syndicate Scientist"
name = "Syndicate Researcher"
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/toggle/labcoat
shoes = /obj/item/clothing/shoes/combat
@@ -145,3 +154,99 @@
/obj/item/card/id/syndicate_command/scientist
assignment = "Researcher"
//HEADS OF STAFF//
/obj/effect/mob_spawn/human/syndicate/assops/heads
name = "Syndicate Head Of Staff"
outfit = /datum/outfit/syndicate_empty/heads
/datum/outfit/syndicate_empty/heads
name = "Syndicate Head Of Staff"
ears = /obj/item/radio/headset/assault/command
implants = list(/obj/item/implant/weapons_auth)
//Admiral//
/obj/effect/mob_spawn/human/syndicate/assops/heads/station_admiral
name = "Syndicate Admiral"
short_desc = "You are the Station Admiral of Syndicate facility DS-1."
flavour_text = "Your job is to coordinate the heads of staff onboard, and otherwise relax. Unlike those Nanotrasen NADs, yours is in no danger of being tracked."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/heads/syndicate_admiral
/datum/outfit/syndicate_empty/heads/syndicate_admiral
name = "Syndicate Admiral"
uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
head = /obj/item/clothing/head/hos/beret/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack
id = /obj/item/card/id/syndicate_command/admiral
backpack_contents = list(/obj/item/gun/ballistic/automatic/pistol/aps)
/obj/item/card/id/syndicate_command/admiral
assignment = "Station Admiral"
//Chief Master At Arms//
/obj/effect/mob_spawn/human/syndicate/assops/heads/chief_master_at_arms
name = "Syndicate Chief Master At Arms"
short_desc = "You are the Chief Master At Arms onboard the Syndicate facility DS-1."
flavour_text = "Your job is to oversee the Brig Officers and Master At Arms."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/heads/chief_master_at_arms
/datum/outfit/syndicate_empty/heads/chief_master_at_arms
name = "Chief Master At Arms"
uniform = /obj/item/clothing/under/rank/security/head_of_security
suit = /obj/item/clothing/suit/armor/hos/trenchcoat
head = /obj/item/clothing/head/hos/beret/syndicate
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack/security
id = /obj/item/card/id/syndicate_command/chief_master_at_arms
backpack_contents = list(/obj/item/melee/baton/loaded)
/obj/item/card/id/syndicate_command/chief_master_at_arms
assignment = "Chief Master At Arms"
//Chief Research Officer//
/obj/effect/mob_spawn/human/syndicate/assops/heads/chief_research_officer
name = "Syndicate Chief Research Officer"
short_desc = "You are the Chief Research Officer onboard the Syndicate facility DS-1."
flavour_text = "Your job is to oversee the Researchers and maintain DS-1's coordinate secrecy." //An IC Solution to the problem of DS-1 Operatives getting too handsy with research, since RND consoles log who did research and where.
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/heads/chief_research_officer
/datum/outfit/syndicate_empty/heads/chief_research_officer
name = "Chief Research Officer"
uniform = /obj/item/clothing/under/rank/rnd/research_director
suit = /obj/item/clothing/suit/toggle/labcoat
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack/science
id = /obj/item/card/id/syndicate_command/chief_research_officer
backpack_contents = list(/obj/item/melee/classic_baton/telescopic)
/obj/item/card/id/syndicate_command/chief_research_officer
assignment = "Chief Research Officer"
//Chief Engineering Officer//
/obj/effect/mob_spawn/human/syndicate/assops/heads/chief_engineering_officer
name = "Syndicate Chief Engineering Officer"
short_desc = "You are the Chief Engineering Officer onboard the Syndicate facility DS-1."
flavour_text = "Your job is to maintain DS-1's power generation and hull integrity. Or 'touching up' the disused section east of cargo."
important_info = "The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives. DO NOT TOUCH THE ARMORY."
outfit = /datum/outfit/syndicate_empty/heads/chief_engineering_officer
/datum/outfit/syndicate_empty/heads/chief_engineering_officer
name = "Chief Engineering Officer"
uniform = /obj/item/clothing/under/rank/engineering/chief_engineer
head = /obj/item/clothing/head/hardhat/white
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/storage/backpack/industrial
id = /obj/item/card/id/syndicate_command/chief_engineering_officer
backpack_contents = list(/obj/item/melee/classic_baton/telescopic)
/obj/item/card/id/syndicate_command/chief_engineering_officer
assignment = "Chief Engineering Officer"