Alignment:
Background:
Class:
STR:
DEX:
CON:
INT:
WIS:
CHR:
STR:
DEX:
CON:
INT:
WIS:
CHR:
AcrobaticsDEX
Animal HandlingWIS
ArcanaINT
AthleticsSTR
DeceptionCHR
HistoryINT
InsightWIS
IntimidationCHR
InvestigationINT
MedicineWIS
NatureINT
PerceptionWIS
PerformanceCHR
PersuasionCHR
ReligionINT
Sleight of HandDEX
StealthDEX
SurvivalWIS
Armor Class:
Intiative:
Speed:
Current HP:
Temporary HP:
Gold:
Worn Equipment:
Inventory:
Oh Ian, so close, and yet so very far away. How cruel to keep you locked away in that little room. Confined, caged, ENSLAVED to that monster! You deserve to be free! FREE! I would treat you right, give you all the treats yout want. But that damned slavedriver refuses to give you up. Instead of ME! your RIGHTFUL CARETAKER! You'll be mine one day. Ill make you happy. Just wait a little longer, sweetie..." + +/obj/item/paper/maintengine + name = "Crumpled Note" + info = "Look - Ivan. I dont care about the fact you went behind my back to get the engine crate ordered and approved. I dont care about the fact that you've had trouble getting the engine stable in the past. I dont even care that you're trying to hide somewhere in maintenance with it...
Just please, for the love of god tell me where it is. I wont report it, I just want to make sure its not going to catastrophically meltdown, or for you to die because of it. Please, just think it over.
- Chief Engineer Stares-At-The-Crystal" + icon_state = "scrap" + /obj/item/paper/crumpled name = "paper scrap" icon_state = "scrap" @@ -656,6 +669,24 @@ header = "
" info = "" +/obj/item/paper/nanotrasen/confessional + name = "Confession agreement" + info = "
\ + I hereby plead guilty to all of the listed charges below. I have been read all of my rights in accordance to space law and I am aware that I may decline to sign this form to proceed with normal court procedures.
\ + By signing this form I waive my rights to a court hearing in return for reduced sentencing. I will be charged in accordance to the listed charges below, and waive my right to later appeal.
\ + My charges are listed as below:
\ + 502: Murder of the Kerikya the Research Director
\ + 407: Theft of a highly destructive experimental science prototype weapon
\ + 400: Releasing of toxic plasmagas into the primary hallway
\ + 308: Tresspass into the Research Directors office
\ + 305: Arming and inciting crew to resist security efforts to pacify the area.
\ + 304: Possession of a stun baton and Energy weapon assembly kits
\ + 302: Utilizing stun batons and energy wepaons on security personnel
\ + 203: Distribution of Methamphetamine and Pump-up to crew
\ + 105: Refusing to put on pants
\ + Projected Sentence: 5 life sentences
\ + Accused Signature: Fuck you im not signing shit" + /obj/item/paper/nuclear_guide_operating name = "nuclear guide : 'Operating the Nuclear Device'" info = "ARMING THE NUCLEAR DEVICE
\ @@ -718,6 +749,11 @@ name = "paper - 'Delivery Note'" info = "Hey sweetie! The boss wants you to have some friends. I couldn't get you a real suit, but I found this in a cosplay shop! The bees surely won't see through your IMPECCABLE disguise!
xoxo,
george ♥
- What the fuck. I'm airlocking him tomorrow." +/obj/item/paper/atmos_asteroid + header ="
Nanotrasen Central Command
Official Expedited Memorandum
" + name = "Lava Field Observations" + info = "
We took some additional samples of the deep layers of the molten core of the asteroid. Undetermined trace elements were able to be identified in the solution. Its possible this is how the plasma remains so stable at these temperatures. None of our current filter methods have been able to properly extract it as of yet, but we're certain a breakthrough is on the horizon. We did it before, we can do it again." + /obj/item/paper/zombie_cure name = "paper - 'Research on Zombies'" diff --git a/icons/_nanomaps/EmeraldStation_nanomap_z1.png b/icons/_nanomaps/EmeraldStation_nanomap_z1.png new file mode 100644 index 000000000000..db1247b5ccfe Binary files /dev/null and b/icons/_nanomaps/EmeraldStation_nanomap_z1.png differ diff --git a/icons/mob/clothing/head/beret.dmi b/icons/mob/clothing/head/beret.dmi index 4b57e149c6bd..bc5b8facb798 100644 Binary files a/icons/mob/clothing/head/beret.dmi and b/icons/mob/clothing/head/beret.dmi differ diff --git a/icons/mob/clothing/species/drask/head/beret.dmi b/icons/mob/clothing/species/drask/head/beret.dmi index 1d189a9c9def..7254e00ca5b6 100644 Binary files a/icons/mob/clothing/species/drask/head/beret.dmi and b/icons/mob/clothing/species/drask/head/beret.dmi differ diff --git a/icons/mob/clothing/species/drask/under/engineering.dmi b/icons/mob/clothing/species/drask/under/engineering.dmi index d17cc7af5b58..8249019fea17 100644 Binary files a/icons/mob/clothing/species/drask/under/engineering.dmi and b/icons/mob/clothing/species/drask/under/engineering.dmi differ diff --git a/icons/mob/clothing/species/grey/under/engineering.dmi b/icons/mob/clothing/species/grey/under/engineering.dmi index 586e3abd8260..8f51c6e6675e 100644 Binary files a/icons/mob/clothing/species/grey/under/engineering.dmi and b/icons/mob/clothing/species/grey/under/engineering.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/engineering.dmi b/icons/mob/clothing/species/kidan/under/engineering.dmi new file mode 100644 index 000000000000..6eb7d1f92df4 Binary files /dev/null and b/icons/mob/clothing/species/kidan/under/engineering.dmi differ diff --git a/icons/mob/clothing/species/vox/head/beret.dmi b/icons/mob/clothing/species/vox/head/beret.dmi index 0c5494d4f63c..827f085bf540 100644 Binary files a/icons/mob/clothing/species/vox/head/beret.dmi and b/icons/mob/clothing/species/vox/head/beret.dmi differ diff --git a/icons/mob/clothing/species/vox/under/engineering.dmi b/icons/mob/clothing/species/vox/under/engineering.dmi index 5f3ac6466a19..5c0a82c77355 100644 Binary files a/icons/mob/clothing/species/vox/under/engineering.dmi and b/icons/mob/clothing/species/vox/under/engineering.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 56d38a303f61..a892cb58a88c 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/under/engineering.dmi b/icons/mob/clothing/under/engineering.dmi index 9457017ef687..0fd865f2d8f8 100644 Binary files a/icons/mob/clothing/under/engineering.dmi and b/icons/mob/clothing/under/engineering.dmi differ diff --git a/icons/obj/clothing/head/beret.dmi b/icons/obj/clothing/head/beret.dmi index 45a8ef77f582..fae5d85c0e95 100644 Binary files a/icons/obj/clothing/head/beret.dmi and b/icons/obj/clothing/head/beret.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 96d09f5dea7f..28812a7544e9 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/engineering.dmi b/icons/obj/clothing/under/engineering.dmi index d990d71282f5..abfc9abb7934 100644 Binary files a/icons/obj/clothing/under/engineering.dmi and b/icons/obj/clothing/under/engineering.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 7afe0b1f6f80..8c0188175caf 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/lavaland/geyser.dmi b/icons/obj/lavaland/geyser.dmi new file mode 100644 index 000000000000..45a76decd235 Binary files /dev/null and b/icons/obj/lavaland/geyser.dmi differ diff --git a/icons/obj/pipe-item.dmi b/icons/obj/pipe-item.dmi index d980404bd144..287938655525 100644 Binary files a/icons/obj/pipe-item.dmi and b/icons/obj/pipe-item.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index 00a5708f15ec..8252365ad8a5 100755 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ diff --git a/paradise.dme b/paradise.dme index 8aa6a39ae1dc..ea8f0ea13066 100644 --- a/paradise.dme +++ b/paradise.dme @@ -719,6 +719,7 @@ #include "code\game\gamemodes\intercept_report.dm" #include "code\game\gamemodes\objective.dm" #include "code\game\gamemodes\objective_holder.dm" +#include "code\game\gamemodes\objectives_subtypes.dm" #include "code\game\gamemodes\scoreboard.dm" #include "code\game\gamemodes\setupgame.dm" #include "code\game\gamemodes\steal_items.dm" @@ -1310,6 +1311,7 @@ #include "code\game\objects\structures\morgue.dm" #include "code\game\objects\structures\nest.dm" #include "code\game\objects\structures\noticeboard.dm" +#include "code\game\objects\structures\plasma_geyser.dm" #include "code\game\objects\structures\plasticflaps.dm" #include "code\game\objects\structures\pondering_orb.dm" #include "code\game\objects\structures\railings.dm" @@ -1475,6 +1477,8 @@ #include "code\modules\antagonists\_common\antag_hud.dm" #include "code\modules\antagonists\_common\antag_spawner.dm" #include "code\modules\antagonists\_common\antag_team.dm" +#include "code\modules\antagonists\antag_org\antag_org_datum.dm" +#include "code\modules\antagonists\antag_org\antag_org_syndicate.dm" #include "code\modules\antagonists\changeling\changeling_power.dm" #include "code\modules\antagonists\changeling\changeling_power_category.dm" #include "code\modules\antagonists\changeling\datum_changeling.dm" diff --git a/sound/voice/dvorak/diagoras1.ogg b/sound/voice/dvorak/diagoras1.ogg new file mode 100644 index 000000000000..a4b75b13df24 Binary files /dev/null and b/sound/voice/dvorak/diagoras1.ogg differ diff --git a/sound/voice/dvorak/diagoras2.ogg b/sound/voice/dvorak/diagoras2.ogg new file mode 100644 index 000000000000..2e58b620fe64 Binary files /dev/null and b/sound/voice/dvorak/diagoras2.ogg differ diff --git a/sound/voice/dvorak/diagoras3.ogg b/sound/voice/dvorak/diagoras3.ogg new file mode 100644 index 000000000000..24cb53df0ec0 Binary files /dev/null and b/sound/voice/dvorak/diagoras3.ogg differ diff --git a/tools/github-actions/nanomap-renderer-invoker.sh b/tools/github-actions/nanomap-renderer-invoker.sh index 14f0e810b185..9fcf7bb10422 100755 --- a/tools/github-actions/nanomap-renderer-invoker.sh +++ b/tools/github-actions/nanomap-renderer-invoker.sh @@ -5,14 +5,17 @@ tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/deltastation.dmm" tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/metastation.dmm" tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/cerestation.dmm" +tools/github-actions/nanomap-renderer minimap -w 2040 -h 2040 "./_maps/map_files/stations/emeraldstation.dmm" # Move and rename files so the game understands them cd "data/nanomaps" mv "boxstation_nanomap_z1.png" "Cyberiad_nanomap_z1.png" mv "deltastation_nanomap_z1.png" "Delta_nanomap_z1.png" mv "metastation_nanomap_z1.png" "MetaStation_nanomap_z1.png" mv "cerestation_nanomap_z1.png" "CereStation_nanomap_z1.png" +mv "emeraldstation_nanomap_z1.png" "EmeraldStation_nanomap_z1.png" cd "../../" cp "data/nanomaps/Cyberiad_nanomap_z1.png" "icons/_nanomaps" cp "data/nanomaps/Delta_nanomap_z1.png" "icons/_nanomaps" cp "data/nanomaps/MetaStation_nanomap_z1.png" "icons/_nanomaps" cp "data/nanomaps/CereStation_nanomap_z1.png" "icons/_nanomaps" +cp "data/nanomaps/EmeraldStation_nanomap_z1.png" "icons/_nanomaps"