From e964f8d8907658f381789fd70ce449f764ce0638 Mon Sep 17 00:00:00 2001 From: ben10083 <31709901+ben10083@users.noreply.github.com> Date: Tue, 5 Jun 2018 13:46:46 -0400 Subject: [PATCH 1/7] Fixed name of Cargo Warehouse camera (#4863) Cargo Warehouse Entrance camera was spelled wrong, fixed it. --- maps/aurora/aurora-4_mainlevel.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index e2a22d61e2c..3cd3afcd4c0 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -2792,7 +2792,7 @@ /area/quartermaster/office) "afA" = ( /obj/machinery/camera/network/supply{ - c_tag = "Cargo - Warehouse Entrence"; + c_tag = "Cargo - Warehouse Entrance"; dir = 1 }, /obj/effect/floor_decal/corner/brown{ From 72a02101188cb13004729b0900da9d900ee25f56 Mon Sep 17 00:00:00 2001 From: Werner Date: Sun, 10 Jun 2018 22:33:27 +0200 Subject: [PATCH 2/7] Removes the psychedelic jumpsuit from random loot (#4875) Requested by abo --- code/game/objects/random/random.dm | 1 - html/changelogs/arrow768-psychsuit.yml | 37 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/arrow768-psychsuit.yml diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 197045c4f1f..d2b309fe5fb 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -675,7 +675,6 @@ /obj/item/clothing/under/overalls = 1, /obj/item/clothing/under/redcoat = 0.5, /obj/item/clothing/under/serviceoveralls = 1, - /obj/item/clothing/under/psyche = 0.5, /obj/item/clothing/under/rank/dispatch = 0.8, /obj/item/clothing/under/syndicate/tacticool = 1, /obj/item/clothing/under/syndicate/tracksuit = 0.2, diff --git a/html/changelogs/arrow768-psychsuit.yml b/html/changelogs/arrow768-psychsuit.yml new file mode 100644 index 00000000000..7408bf240b4 --- /dev/null +++ b/html/changelogs/arrow768-psychsuit.yml @@ -0,0 +1,37 @@ +################################ +# 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 +################################# + +# Your name. +author: Arrow768 + +# 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: + - rscdel: "The psychedelic jumpsuit can no longer be found in maint." From 4cafc638ededed9417bc714a349cb61c63075ae8 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 10 Jun 2018 23:34:28 +0300 Subject: [PATCH 3/7] Changelogs, 10JUN2018 --- html/changelog.html | 6 +++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/arrow768-psychsuit.yml | 37 -------------------------- 3 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 html/changelogs/arrow768-psychsuit.yml diff --git a/html/changelog.html b/html/changelog.html index fe3aabae566..fb61f96954b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

10 June 2018

+

Arrow768 updated:

+
    +
  • The psychedelic jumpsuit can no longer be found in maint.
    • +
+

03 June 2018

BurgerBB updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 7e46944753a..266fe38232a 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5529,3 +5529,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. from disposal inlets. - bugfix: Disposal outlets now spread out items so all the trash doesn't pile up on one tile. +2018-06-10: + Arrow768: + - rscdel: The psychedelic jumpsuit can no longer be found in maint. diff --git a/html/changelogs/arrow768-psychsuit.yml b/html/changelogs/arrow768-psychsuit.yml deleted file mode 100644 index 7408bf240b4..00000000000 --- a/html/changelogs/arrow768-psychsuit.yml +++ /dev/null @@ -1,37 +0,0 @@ -################################ -# 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 -################################# - -# Your name. -author: Arrow768 - -# 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: - - rscdel: "The psychedelic jumpsuit can no longer be found in maint." From 6c3489481cb0dc1059537bab79c63cf57cb45388 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 11 Jun 2018 07:16:39 -0300 Subject: [PATCH 4/7] Custom items 09/06 (#4874) Custom Martian Raider T-Shirt - Caiden Moyers - tylaaaar Senior Alchemist Robes - Eri Akhandi - paradoxspace Solarian Alliance Military ID - Kalren Halstere - brutishcrab51 --- code/modules/cargo/randomstock.dm | 8 ++-- code/modules/customitems/item_defines.dm | 43 ++++++++++++++++++- icons/obj/custom_items/eri_robes.dmi | Bin 0 -> 779 bytes icons/obj/custom_items/halstere_clothing.dmi | Bin 1742 -> 2081 bytes icons/obj/custom_items/moyers_shirt.dmi | Bin 0 -> 813 bytes 5 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 icons/obj/custom_items/eri_robes.dmi create mode 100644 icons/obj/custom_items/moyers_shirt.dmi diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm index 4fa9c4f39ed..1593e664ceb 100644 --- a/code/modules/cargo/randomstock.dm +++ b/code/modules/cargo/randomstock.dm @@ -683,17 +683,17 @@ var/list/global/random_stock_large = list( var/list/allgloves = typesof(/obj/item/clothing/gloves) var/list/exclusion = list(/obj/item/clothing/gloves, - /obj/item/clothing/gloves/fluff, - /obj/item/clothing/gloves/black/fluff, - /obj/item/clothing/gloves/white/unathi/fluff, /obj/item/clothing/gloves/swat/bst, - /obj/item/clothing/gloves/swat/fluff, /obj/item/clothing/gloves/black/fluff, /obj/item/clothing/gloves/powerfist, /obj/item/clothing/gloves/claws) exclusion += typesof(/obj/item/clothing/gloves/rig) exclusion += typesof(/obj/item/clothing/gloves/lightrig) exclusion += typesof(/obj/item/clothing/gloves/watch) + exclusion += typesof(/obj/item/clothing/gloves/swat/fluff) + exclusion += typesof(/obj/item/clothing/gloves/black/fluff) + exclusion += typesof(/obj/item/clothing/gloves/white/unathi/fluff) + exclusion += typesof(/obj/item/clothing/gloves/fluff) allgloves -= exclusion var/number = rand(1,5) while (number > 0) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 5f0e3749c11..1644aa9d315 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2265,4 +2265,45 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A. new /obj/item/fluff/yarn/blue(src) new /obj/item/fluff/yarn/green(src) new /obj/item/fluff/yarn/purple(src) - new /obj/item/fluff/yarn/yellow(src) \ No newline at end of file + new /obj/item/fluff/yarn/yellow(src) + + +/obj/item/clothing/under/fluff/moyers_shirt //Custom Martian Raider T-Shirt - Caiden Moyers - tylaaaar + name = "custom martian raider t-shirt" + desc = "A Martian Raider Spaceball T-shirt with the name \"MOYERS\" written on the back in plain white text." + icon = 'icons/obj/custom_items/moyers_shirt.dmi' + icon_state = "moyers_shirt" + item_state = "moyers_shirt" + contained_sprite = TRUE + + +/obj/item/clothing/suit/fluff/eri_robes //Senior Alchemist Robes - Eri Akhandi - paradoxspace + name = "senior alchemist robes" + desc = "A green set of robes, trimmed with what appears to be real gold. Looking at the necklace, you can see the alchemical symbol for the Philosopher's Stone, made of ruby." + icon = 'icons/obj/custom_items/eri_robes.dmi' + icon_state = "eri_robes" + item_state = "eri_robes" + contained_sprite = TRUE + + +/obj/item/fluff/halstere_card //Solarian Alliance Military ID - Kalren Halstere - brutishcrab51 + name = "solarian alliance military ID" + desc = "A green and white military identification card, with an Alliance of Sovereign Solarian Nations sigil stamped on the front." + icon = 'icons/obj/custom_items/halstere_clothing.dmi' + icon_state = "halstere_card" + w_class = 2 + var/flipped = FALSE + +/obj/item/fluff/halstere_card/attack_self(mob/user as mob) + flipped = !flipped + queue_icon_update() + +/obj/item/fluff/halstere_card/update_icon() + if(flipped) + icon_state = "halstere_card_open" + else + icon_state = initial(icon_state) + +/obj/item/fluff/halstere_card/examine(mob/user) + if(..(user, 1) && flipped) + to_chat(user, "The name 'Halstere, Kalren C.' is stamped on it. An expiration date is listed on it, '2465JAN01'. A pay grade is listed beside the name. 'MAJ/O4'. A number is listed under the expiration date: '14015236810'.") \ No newline at end of file diff --git a/icons/obj/custom_items/eri_robes.dmi b/icons/obj/custom_items/eri_robes.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5a44ee03ed2092321bbb0b9c98b8b34cac4124ee GIT binary patch literal 779 zcmV+m1N8ifP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DYYmwz9>H_wOEOZGbOXA7$|1Q#hF%=n41b= zW2%fVE=4FdK~b!%;OgfBb_W0)b17%Z@up?~00Iw5L_t(YiS3oYZ`wc<$Io>K1WV4r zQlu`m8+IdkuwWsvQD~U3cz;0uhx`FVW;pDT49

    3>H}`HN&a*&-F@G?j1jlpj7I@ zcR`=0_qq2htTQ2}yg814c2xhlN533nSeGL@_KsNy`p{3`KEi6jdF%ojVYSJ(HqqE> zYeMr*6P!MEuhB$jOq*zfd)gXZfk!9mgfWcK0rJG8uees;y8u90sh(*Rwm}`~0HmNe zdYn+1vsoD^;pR#gS}nykBh`FfE^67|k<@{vo6-x#DWr-?k3_StERer{(qL4sIJzhl z`=0NuS>`Euju&fcaO?MuHG%jOVwvh;S}LKI)r)R7m#gmPE#YI&X0JRW$sXPk2&sp+ zNyo&qhv{RE3&milvk>|Fgn9Npp%Q~3M-NqT!7^7_{WSuhHVjSD?k{h9wKzW^}(%ZTA=IHmvq002ov JPDHLkV1gf9S4RK< literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/halstere_clothing.dmi b/icons/obj/custom_items/halstere_clothing.dmi index c45533383cfd968ce43ad4712f64c8663e602816..0d72df2f7b364cd03dece2fa33216c721c5f0d62 100644 GIT binary patch delta 1911 zcmV--2Z;F24WST_7Y?8Z0{{R3yb+fl0002zktM8u@sH>|ZbU9oGA2bTQj=S&(6FD$ zq?)m~|NsBl+1YZ4jx9PrE-Wmsudlkgy7d{gJB10Ph0004W zQchCV=-0C=30Qo9bqFbtfNuZY?m@#xBeTA>c~ z7owCCW1E)s$`$ zhoyn^<+HPc$1&aDBZxI80qUFxsQ;d}6iruuzklQj>(Q%TkeYY;000IqNkl9De6%p=|NlL^SF#;gbfwfZR(g(Jh(pgS zOOLNU;#{jy6ciK`6!h~besV13*BE0p+ONkkcQNodt`le1MT~XFv8bDhxcxY0C}_cd z+yn=cb1Nd)SjcGAg^(*Uk}HW2_1PkBU&=&F%6h{LxSAw<#X<;Xl2Cwac=0R1z>L@6 z^rg%Q;eFlQ#5&p*LdAzgOrBs3iQOX;1Q7o(2=Q%In%ej!`L)4__H`v-QUw5j zud4wBWw;U0?n}uFz%^+Eg!aX6PC!9_07ADl7~4pIK=9c+sq0&AAZUW$cD%Cz7 zB+Z9}vM6Y>nT}9d9{@KuH!*@XKw*oZumN%|vj~|B%;Rqg1f&{JJ!}V5eN3J&aR|rM z7?{UbfOG@+G2sBjb$~pdIRKo#06@Vk4Im&nL~t#`d29n@4nT*$Xh6xNqYJG*%K*)H zBY79N0GSOCJ_@7_(C!PN0L`m^bd(QbCm_8J@?4&LcY&awprD|jpdhP4e(*=+2O~#* zkoK#|55ku|YkrXSE6ERH7uxcJ7QdSOpaQVu2Q7Xj`N0hY*pOs?(B@Z?AN&IWFm*xX z2W@^O`N1MWME=j^FFrq*MTpD~+Wp1n2eSy3^()8^>Ijwf7oQ)@BShtY|6Km!^Mg7< zbZ*AwFFZf!0C4&X&krs;pz1>D=wjNhAV2srzzXt%u{xIbLw+zQXxZhQVzpXrj%tW9 z^PFlI+zuqvt%CL)SD=0BB5Ji4E;7isWg+D1VVUI$)VFd;Mi~sLzT1}uY_?EM5^(!Z z)Hd0`wpN?++gX9KfKjV|31>H3r0=SKXJ-fO7Fj{71vV5a4H&5imOs6yr5AO5c+nh>hM=k1&T8y z4m|;0X#wDH)(61ro15#;liM$sLmypy0eoLkKu7@IfOG^s0e-!@ySsy<9q{(nAK*Oz z-n#&OM$iG6jX|GXe1CsWckwkw@Y?SfM3I0uN?ym{zgO@>0#0&y1Vlm-@Zrk?X!7vj za~-^1vaEyNBREh4kp3ir2u>cq!H+jU4C0mgEMC$GPJhV=etUd;^aS|qcFO?x>~_oh x4Xf#XaC*Z!_HsY?oWS5eyMoH;f`Wnw{RjH?3fzedukZi>002ovPDHLkV1m(*hf4qe delta 1570 zcmV+-2Hp9g5Y7#d7Y=|30{{R3yS;n(zP3b|)D(ujo$HDTemxpNC1`|1AA~e6kcct67$ml$4b8^C*9D?BoxOF$38j z<~hU|AkT-w*+ZLi+j(w>p^&(r=Y~Z+gu4JT0aQe?IVflit;G|}@T9PIxE&Jr5eqNG z;V2AvS`=`i5RzFG65ttM{0T9b;59^j#D4$A5lOn0Mf9Hj5#le zz{2(zMtx$k4d57Lz&EClrwITJj|7Mo?AhpTQ80kr>LBXduYi_=gGnf?c>`JofdPY) z1T1wsq70oofWQ#%;3H2U2Hf^rz#WEvI0%^28fRz>DMM)8zrNqMZi1Vj@A^l~GSmS% zB6xqW#>Qo+v(JDN0z8%a=L5=oOo(k@$TmJhU3~(aOeUN`4bW;Cv>G4)HW>;B?BY)> z14nm4-@>_c5A5PQK)D0{GZ6vgbwE7dL;#|`B|vMG4j53pMR+ZL<9VzB znh0RT-!~u{j0~abn+7oaX=F15F+igM(w_p<0CnG52N+(Zv&~H$1(er8*yuohJRm74 zDJdx_DM?kT5B`YyU>2zl%6>ofLHg3C)(2(3m--+Np;jMM{C?_#4nV07Dt<5Z!E**U zN3lMr`MuN!|6~9zT?q9-&F`guKGLx_;gRcYZp+1yt#|c^?)XrBkJ1`qI(Z-aHIz45~Kuiiupm6Gy;6?@?-gNc^8a;Pt-AQ zL8TPnrvRWeE#UU{!k2*3o(sRpRRcs17~IvsTLuYmPCw%Q!WJ;#{}4d(m&+wJ5F9~x zvAb%qX+)E1=-hbupm=$a7eE-n+@548R#w0QH3qd?zRmag#iufvRdU zSXCl`lLDyw4WP2~NC&KIYwxVBYXNYzk~2K2Ke&)D75Yn9-qI+7f{tr2QuJ#y;`poK;0+8_48WHUp%1N zNCsGCD-}@nUkw;j0(>=KU9bG1n@|1Mbquhsy92u0Q@KZDzF$Xlz*s=iuc!Y36jg)7 Us{Ms?0000907*qoM6N<$f`G>4qyPW_ diff --git a/icons/obj/custom_items/moyers_shirt.dmi b/icons/obj/custom_items/moyers_shirt.dmi new file mode 100644 index 0000000000000000000000000000000000000000..8206e5d98c0f0287823e962e55ef3f610ec30425 GIT binary patch literal 813 zcmV+|1JeA7P)~mT#m>Uuy${m>0LB0Sxw*Nu006wa zym)wc+}zx>w6v%I0D1rb#KgqR%*@!>*x=yc_xJbC&d$@*)9UK#z`($~0s^hAt*EG| zz`($J!-cB=0004WQchCV=-0C=2JR&a84_w-Y6 z@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DL20os3X2O zBeSSPiHkEOv#1y-Y{cPYiqG+dfXkIa5OPrza*tpD zB)eX(?b<3n5Nk9itt7AElCENZ~PxfUbG7Eez?K|ppu{F z%ZI=L^v{6#4xIKUVqfYn8EAm*r?ddhF~F%M7M~)%+3t2bza9tJ@3;HC3OF1Na0K2H zeP1FIDN%hoH<#vosv~|A@kiCZ4r&wqaRA@%!b=4-gC+pFwr#rzAnuO?x~?6zH2)U> ze0fRZVSvU1(o0mchAqv{%F4?6F9JUSL{%uA>$ik>;eb1OkIwy=wP%^>D z5lRKf!#qIf05*O5mI~;5#JBetV7Wr<`(%JIeHG7OwXAx7Fcn~U{)hqCHq!uH;3&Yk zi2&pD5lUt(cR!d6a4~?J1n_~my+3LPj Date: Thu, 14 Jun 2018 18:23:21 -0500 Subject: [PATCH 5/7] fuck (#4886) --- code/modules/multiz/turfs/open_space.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/multiz/turfs/open_space.dm b/code/modules/multiz/turfs/open_space.dm index 9b1e8a994fc..7ba6c4ce5c8 100644 --- a/code/modules/multiz/turfs/open_space.dm +++ b/code/modules/multiz/turfs/open_space.dm @@ -120,7 +120,7 @@ . = ..() icon_state = "Fill" -/turf/simulated/open/airless/chasm/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) +/turf/simulated/open/chasm/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) underlay_appearance.icon = 'icons/turf/basalt.dmi' underlay_appearance.icon_state = "basalt" if (prob(20)) From f2e2d32359db7542175e9868c40719efef89ca3e Mon Sep 17 00:00:00 2001 From: Werner Date: Sat, 16 Jun 2018 21:15:37 +0200 Subject: [PATCH 6/7] ID Cards ejected from modular computers are no longer ejected onto the floor. (#4883) Tries to put ID cards and intellicards into the hands of the user instead of throwing it onto the floor --- .../computers/modular_computer/interaction.dm | 4 +- html/changelogs/Arrow768-idejection.yml | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Arrow768-idejection.yml diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm index 2859e1d091f..7baa4d31f70 100644 --- a/code/modules/modular_computers/computers/modular_computer/interaction.dm +++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm @@ -63,7 +63,7 @@ for(var/datum/computer_file/program/P in idle_threads) P.event_idremoved(1) - card_slot.stored_card.forceMove(get_turf(src)) + user.put_in_hands(card_slot.stored_card) card_slot.stored_card = null update_uis() to_chat(user, "You remove the card from \the [src]") @@ -88,7 +88,7 @@ to_chat(user, "There is no intellicard connected to \the [src].") return - ai_slot.stored_card.forceMove(get_turf(src)) + user.put_in_hands(ai_slot.stored_card) ai_slot.stored_card = null ai_slot.update_power_usage() update_uis() diff --git a/html/changelogs/Arrow768-idejection.yml b/html/changelogs/Arrow768-idejection.yml new file mode 100644 index 00000000000..14ed8a47612 --- /dev/null +++ b/html/changelogs/Arrow768-idejection.yml @@ -0,0 +1,37 @@ +################################ +# 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 +################################# + +# Your name. +author: Arrow768 + +# 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: + - tweak: "ID Cards ejected from modular computers are no longer ejected onto the floor." From d274dec76aaa1cce5e77a088bc3f2d4e03ab3bc3 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 16 Jun 2018 22:16:42 +0300 Subject: [PATCH 7/7] Changelogs, 16JUN2018 --- html/changelog.html | 6 ++++ html/changelogs/.all_changelog.yml | 4 +++ html/changelogs/Arrow768-idejection.yml | 37 ------------------------- 3 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 html/changelogs/Arrow768-idejection.yml diff --git a/html/changelog.html b/html/changelog.html index fb61f96954b..e8b6afeb282 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->

    +

    16 June 2018

    +

    Arrow768 updated:

    +
      +
    • ID Cards ejected from modular computers are no longer ejected onto the floor.
      • +
    +

    10 June 2018

    Arrow768 updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 266fe38232a..7752f309ff9 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5532,3 +5532,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2018-06-10: Arrow768: - rscdel: The psychedelic jumpsuit can no longer be found in maint. +2018-06-16: + Arrow768: + - tweak: ID Cards ejected from modular computers are no longer ejected onto the + floor. diff --git a/html/changelogs/Arrow768-idejection.yml b/html/changelogs/Arrow768-idejection.yml deleted file mode 100644 index 14ed8a47612..00000000000 --- a/html/changelogs/Arrow768-idejection.yml +++ /dev/null @@ -1,37 +0,0 @@ -################################ -# 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 -################################# - -# Your name. -author: Arrow768 - -# 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: - - tweak: "ID Cards ejected from modular computers are no longer ejected onto the floor."