From 058a3ca223ed73d2912c25c01877931cefacb579 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Sun, 22 Oct 2023 07:39:15 +1300 Subject: [PATCH] Konyang: Pirates! (#17591) * konyang pirate outpost * moonshine baby * moonshine * decals * clothes! * mapped-in clothes & changelog * addresses requested changes * reverts accidental change --- aurorastation.dme | 2 + code/modules/clothing/under/miscellaneous.dm | 13 + html/changelogs/RustingWithYou - pirates.yml | 41 + .../under/uniforms/konyang_pirates.dmi | Bin 0 -> 1128 bytes .../konyang/point_verdant/point_verdant-1.dmm | 1254 +++--- .../exoplanets/konyang/pirate_moonshine.dm | 36 + .../exoplanets/konyang/pirate_moonshine.dmm | 1525 ++++++++ .../exoplanets/konyang/pirate_outpost.dm | 104 + .../exoplanets/konyang/pirate_outpost.dmm | 3363 +++++++++++++++++ 9 files changed, 5740 insertions(+), 598 deletions(-) create mode 100644 html/changelogs/RustingWithYou - pirates.yml create mode 100644 icons/clothing/under/uniforms/konyang_pirates.dmi create mode 100644 maps/random_ruins/exoplanets/konyang/pirate_moonshine.dm create mode 100644 maps/random_ruins/exoplanets/konyang/pirate_moonshine.dmm create mode 100644 maps/random_ruins/exoplanets/konyang/pirate_outpost.dm create mode 100644 maps/random_ruins/exoplanets/konyang/pirate_outpost.dmm diff --git a/aurorastation.dme b/aurorastation.dme index 8e45f9a3ca2..512e82059e7 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3688,6 +3688,8 @@ #include "maps\random_ruins\exoplanets\grove\grove.dm" #include "maps\random_ruins\exoplanets\konyang\jeweler_nest.dm" #include "maps\random_ruins\exoplanets\konyang\landing_zone.dm" +#include "maps\random_ruins\exoplanets\konyang\pirate_moonshine.dm" +#include "maps\random_ruins\exoplanets\konyang\pirate_outpost.dm" #include "maps\random_ruins\exoplanets\konyang\village.dm" #include "maps\random_ruins\exoplanets\lava\lava.dm" #include "maps\random_ruins\exoplanets\raskara\pra_exploration_drone.dm" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 33a3fcdaeb1..e8b15f4d7e6 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -688,6 +688,19 @@ icon_state = "konyang_police_lieutenant" item_state = "konyang_police_lieutenant" +/obj/item/clothing/under/konyang/pirate + name = "ragged konyanger clothing" + desc = "A grey shirt and dark shorts in a Konyang style, accentuated with a red scarf. The clothes are dirty, torn, and ragged - evidently not well-maintained by their owner." + icon = 'icons/clothing/under/uniforms/konyang_pirates.dmi' + icon_state = "pirate" + item_state = "pirate" + +/obj/item/clothing/under/konyang/pirate/tanktop + name = "disheveled konyanger clothing" + desc = "A dark yellow outfit in a Konyang style, with the sleeves cut off. It is stained with dirt, grease and a splatter of what looks like blood." + icon_state = "pirate1" + item_state = "pirate1" + /obj/item/clothing/under/rank/konyang/krc name = "konyang robotics company uniform" desc = "A blue button-up shirt and brown trousers, with a red and white-striped tie. On the shirt, the logo of the Konyang Robotics Company is clearly displayed." diff --git a/html/changelogs/RustingWithYou - pirates.yml b/html/changelogs/RustingWithYou - pirates.yml new file mode 100644 index 00000000000..34003c6fd67 --- /dev/null +++ b/html/changelogs/RustingWithYou - pirates.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a Konyang pirate outpost and moonshine den." diff --git a/icons/clothing/under/uniforms/konyang_pirates.dmi b/icons/clothing/under/uniforms/konyang_pirates.dmi new file mode 100644 index 0000000000000000000000000000000000000000..2d1c9bb4644fd718c85bae9d0275547bce58f1cb GIT binary patch literal 1128 zcmV-u1eg1XP)V=- z0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zi zl2jm5sUWim$cis6RpR1I$t)@cY2@NeD@x2w1+fj$RT>hn6rs!zuZg(SDJ!`8xqv+d z03Pu^?_%TaV*mgH7D+@wRA_L&o|e69Ejsp+yFNh4PUQTfoN<(cjtlC@mHb40MIC$e}x3VvFpo2qDpZ z68v%e#2-UUSRw%c^Dpf}0MHp4{R;pq0EIE|2AEo>&>*Z)mdgOhXS+P?V-yep z9QHt#k)U8W>`)FEUbiy9?Pp*dV3b|N2(pC@p8-Au1%S^Grcea9Ti=%t<^B5ZF={^s zzYIRfe+sYX&Gv->ylgkmpMeoo>q!+^f@)osyRuwY4B*w6{nOhUt8aq0H|CWBlw*UE z0(|(i0VMRF2q0!x<*ur#9c`fbfk5nkA)s!x+f~!+I)4N>$N&ck;1!x)*ZBe9u$2L} z2LT`{DJdx_DJjX+|GcAq{qd3lv?fx%2GGZhDJyp8W8w_E^^(szVofH z2>{UZ0fZ6u5V5)XYqZ(iZyxY$1Ru|u`LoXlj(;W{ znSVN;!yolw>`&Ye1y1`ZF7BVl2Ip&iG&r3Ed#r#Eo)7pVC^>-aPje*np9rLMm`6^i z`SSsw>2;ky8z3nuDJdx_DM`COp#J+lQ`-H3-v-d`4;cOYU|xUa{(#ZX4`u==_XmuA zelV9nxj&$vAIwKk?hk0^2R{HH-yhJ<4}JhZyg#6xAN&M>aDPBQKbS4${(yRZFk8y~ u0rmV~zApCzsDC*h__h8?Nl8inMSlV5$5nbTn+li!0000