From 8111652e251d8ffb55b82ad17b7b35f4dd1a45e8 Mon Sep 17 00:00:00 2001 From: ArgobargSoup Date: Sat, 2 Jun 2018 03:03:27 -0700 Subject: [PATCH 01/19] Update custom_items_vr.dm --- code/modules/vore/fluffstuff/custom_items_vr.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 5bfe9fcd97..def6af1d22 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1997,4 +1997,12 @@ /obj/item/borg/upgrade/modkit/chassis_mod/kai/uninstall(obj/item/weapon/gun/energy/kinetic_accelerator/KA) KA.desc = initial(KA.desc) KA.icon = initial(KA.icon) - ..() \ No newline at end of file + ..() + +//ArgobargSoup:Lynn Shady +/obj/item/device/flashlight/pen/fluff/lynn + name = "Lynn's penlight" + desc = "A personalized penlight, a bit bulkier than the standard model. Blue, with a medical cross on it, and the name Lynn Shady engraved in gold." + + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "penlightlynn" From 97041f778e99b2ed1bc3e0cfdf2dded7dbaa8639 Mon Sep 17 00:00:00 2001 From: ArgobargSoup Date: Sat, 2 Jun 2018 03:08:28 -0700 Subject: [PATCH 02/19] Add files via upload adding icons --- icons/vore/custom_items_vr.dmi | Bin 50081 -> 50474 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index f889952b954f2dbef082dc33d72fc868341ad28f..efe71b42241a18f061a90b2f95312d3fdddca87e 100644 GIT binary patch delta 10387 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 delta 9976 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 D-&A=e From dfb52b891c30fe29d61f1ca39c41c39a125cf9b5 Mon Sep 17 00:00:00 2001 From: ArgobargSoup Date: Sat, 2 Jun 2018 03:12:58 -0700 Subject: [PATCH 03/19] Update custom_items.txt --- config/custom_items.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/custom_items.txt b/config/custom_items.txt index 35fb84339c..88cf8e716d 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -60,6 +60,12 @@ character_name: Lethe item_path: /obj/item/clothing/head/helmet/hos/fluff/lethe } +{ +ckey: argobargsoup +character_name: Lynn Shady +item_path: /obj/item/device/flashlight/pen/fluff/lynn +} + { ckey: arokha character_name: Aronai Kadigan From 2f3fa8142562beeee939963e3e4ccf629e23148e Mon Sep 17 00:00:00 2001 From: pontifex2 Date: Sat, 2 Jun 2018 18:28:44 +0200 Subject: [PATCH 04/19] Assorted Zorren changes to make them in line with the lore I set up. Changed their blood colour to a blue. Replaced their native language Siik (?? This is the Tajaran language) with Terminus, a Polaris language currently whitelisted. Disabled the whitelist for Terminus. Changed the description for Terminus so it's actually the Zorren's language. --- code/modules/mob/language/generic.dm | 6 +++--- .../living/carbon/human/species/station/station_vr.dm | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/language/generic.dm b/code/modules/mob/language/generic.dm index 6f851694a9..d81cdf1655 100644 --- a/code/modules/mob/language/generic.dm +++ b/code/modules/mob/language/generic.dm @@ -1,4 +1,4 @@ -// Noise "language", for audible emotes. +LANGUAGE_TERMINUS// Noise "language", for audible emotes. /datum/language/noise name = "Noise" desc = "Noises" @@ -55,12 +55,12 @@ /datum/language/terminus name = LANGUAGE_TERMINUS - desc = "A soft language spoken by the people of the sparsely populated, socially-conscious Precursors' Crypt region." + desc = "A group of languages spoken by the Zorren with a certain degree of mutual intelligibility under each other. Evidence shows it was a single lingua franca which has diverged into many sub languages due to isolation." // VOREstation edit. Original : A soft language spoken by the people of the sparsely populated, socially-conscious Precursors' Crypt region. speech_verb = "mentions" exclaim_verb = "insinuates" colour = "terminus" key = "4" - flags = WHITELISTED + // flags = WHITELISTED (VOREstation edit) syllables = list (".a", "spa", "pan", "blaif", "stra", "!u", "!ei", "!am", "by", ".y", "gry", "zbly", "!y", "fl", "sm", "rn", "cpi", "ku", "koi", "pr", "glau", "stu", "ved", "ki", "tsa", "xau", "jbu", "sny", "stro", "nu", "uan", "ju", "!i", "ge", "luk", "an", "ar", "at", "es", "et", "bel", "ki", "jaa", "ch", "ki", "gh", "ll", "uu", "wat") diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 3ea7eb85f5..133220360b 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -156,8 +156,8 @@ icobase_tail = 1 unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) num_alternate_languages = 3 - secondary_langs = list(LANGUAGE_SIIK) - name_language = LANGUAGE_SIIK + secondary_langs = list(LANGUAGE_TERMINUS) + name_language = LANGUAGE_TERMINUS min_age = 18 max_age = 80 @@ -176,6 +176,7 @@ appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR flesh_color = "#AFA59E" base_color = "#333333" + blood_color = "#240bc4" color_mult = 1 heat_discomfort_strings = list( @@ -194,8 +195,8 @@ icobase_tail = 1 unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) num_alternate_languages = 3 - secondary_langs = list(LANGUAGE_SIIK) - name_language = LANGUAGE_SIIK + secondary_langs = list(LANGUAGE_TERMINUS) + name_language = LANGUAGE_TERMINUS min_age = 18 max_age = 80 @@ -214,6 +215,7 @@ flesh_color = "#AFA59E" base_color = "#333333" + blood_color = "#240bc4" color_mult = 1 inherent_verbs = list(/mob/living/proc/shred_limb) From 3ea860ae99b41804b569e6d351fad0f05e3770c1 Mon Sep 17 00:00:00 2001 From: pontifexminimus2 <36773563+pontifexminimus2@users.noreply.github.com> Date: Sat, 2 Jun 2018 18:32:42 +0200 Subject: [PATCH 05/19] Typo Oops, that doesn't belong there... --- code/modules/mob/language/generic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/language/generic.dm b/code/modules/mob/language/generic.dm index d81cdf1655..d602bf71bb 100644 --- a/code/modules/mob/language/generic.dm +++ b/code/modules/mob/language/generic.dm @@ -1,4 +1,4 @@ -LANGUAGE_TERMINUS// Noise "language", for audible emotes. +// Noise "language", for audible emotes. /datum/language/noise name = "Noise" desc = "Noises" From 7528ac54fb655c3adc74c94d6a4433b285632285 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 2 Jun 2018 11:46:38 -0500 Subject: [PATCH 06/19] Merge pull request #5305 from VOREStation/pol-autosay Prevent autosay() from creating/deleting AIs --- code/_helpers/global_lists.dm | 1 + code/game/objects/items/devices/radio/radio.dm | 4 +--- code/modules/mob/living/silicon/ai/ai.dm | 13 ++++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index 34a58f18ca..2e776c82d0 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -9,6 +9,7 @@ var/global/list/player_list = list() //List of all mobs **with clients attach var/global/list/mob_list = list() //List of all mobs, including clientless var/global/list/human_mob_list = list() //List of all human mobs and sub-types, including clientless var/global/list/silicon_mob_list = list() //List of all silicon mobs, including clientless +var/global/list/ai_list = list() //List of all AIs, including clientless var/global/list/living_mob_list = list() //List of all alive mobs, including clientless. Excludes /mob/new_player var/global/list/dead_mob_list = list() //List of all dead mobs, including clientless. Excludes /mob/new_player var/global/list/listening_objects = list() //List of all objects which care about receiving messages (communicators, radios, etc) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index d408a033f7..716bbff1b8 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -247,14 +247,12 @@ var/global/list/default_medbay_channels = list( if (!connection) return - var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(src, null, null, 1) + var/static/mob/living/silicon/ai/announcer/A = new /mob/living/silicon/ai/announcer(src, null, null, 1) A.SetName(from) Broadcast_Message(connection, A, 0, "*garbled automated announcement*", src, message, from, "Automated Announcement", from, "synthesized voice", 4, 0, list(0), connection.frequency, "states") - qdel(A) - return // Interprets the message mode when talking into a radio, possibly returning a connection datum /obj/item/device/radio/proc/handle_message_mode(mob/living/M as mob, message, message_mode) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 5fb2161d4f..8a34f5ee76 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -1,7 +1,6 @@ #define AI_CHECK_WIRELESS 1 #define AI_CHECK_RADIO 2 -var/list/ai_list = list() var/list/ai_verbs_default = list( // /mob/living/silicon/ai/proc/ai_recall_shuttle, /mob/living/silicon/ai/proc/ai_emergency_message, @@ -802,5 +801,17 @@ var/list/ai_verbs_default = list( // If that is ever fixed please update this proc. return TRUE +//Special subtype kept around for global announcements +/mob/living/silicon/ai/announcer/initialize() + . = ..() + mob_list -= src + living_mob_list -= src + dead_mob_list -= src + ai_list -= src + silicon_mob_list -= src + +/mob/living/silicon/ai/announcer/Life() + return + #undef AI_CHECK_WIRELESS #undef AI_CHECK_RADIO From fad161aeb79424eea79b40765397133cb4b0b9e1 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 2 Jun 2018 15:22:15 -0500 Subject: [PATCH 08/19] Merge pull request #5319 from SubberTheFabulous/LoveBranded Adds two new sets of robolimbs --- code/modules/organs/robolimbs.dm | 12 ++++++++++++ .../cyberlimbs/unbranded/unbranded_alt1.dmi | Bin 0 -> 1426 bytes .../cyberlimbs/unbranded/unbranded_alt2.dmi | Bin 0 -> 1850 bytes 3 files changed, 12 insertions(+) create mode 100644 icons/mob/human_races/cyberlimbs/unbranded/unbranded_alt1.dmi create mode 100644 icons/mob/human_races/cyberlimbs/unbranded/unbranded_alt2.dmi diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 92e102d921..1f15f125c2 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -57,6 +57,18 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ monitor_styles = standard_monitor_styles unavailable_to_build = 1 +/datum/robolimb/unbranded_alt1 + company = "Unbranded - Protez" + desc = "A simple robotic limb with retro design. Seems rather stiff." + icon = 'icons/mob/human_races/cyberlimbs/unbranded/unbranded_alt1.dmi' + unavailable_to_build = 1 + +/datum/robolimb/unbranded_alt2 + company = "Unbranded - Mantis Prosis" + desc = "This limb has a casing of sleek black metal and repulsive insectile design." + icon = 'icons/mob/human_races/cyberlimbs/unbranded/unbranded_alt2.dmi' + unavailable_to_build = 1 + /datum/robolimb/nanotrasen company = "NanoTrasen" desc = "A simple but efficient robotic limb, created by NanoTrasen." diff --git a/icons/mob/human_races/cyberlimbs/unbranded/unbranded_alt1.dmi b/icons/mob/human_races/cyberlimbs/unbranded/unbranded_alt1.dmi new file mode 100644 index 0000000000000000000000000000000000000000..76bd5844a23d8489fe7d323e21e4292883c20e42 GIT binary patch literal 1426 zcmY*Zdpy%?82_#4lru*{j@6J{K4r%w9F>DGY%b-ll!-$V#bE$ z9smH6xxnP^ow9X|;uIv?5NBPy5N&O3W@cu7etsMdhtKCzsZ?16g+guh9tVzZ?Y*a{ zgjX~*H6@Wq3972;>FGob4O?4VGKqx4;hdeFy}iACeS8=@Xx_3iP_&1eCtx!(5-J1L zcrU+b`w(0(HY_SSEbJw7p>+;;cdarLV7X>74hld8^8MZqC@?#1Y?FBOHa z^mbQ-L)V0?c@xIAWmb+3%MTY_F^b^8lM}oM=>zT^y z^?wX%Sz~HKk(Mr_NDCg2#fQg&;7psyt<#myHb=N6Mu#!16>JMGgS1p+U9+WqzRQuU z95C|$%9-AGP~uz{S|TqLq1BZmiABg3vnNFb4r}}1msrf^UG?z;5;>_%@$U?s z))N&o#U&{3zWEbnGZyCRr$S^{lv%k=lBbFG5T*F!WV5q*Y6JLJO5(=SAY{A?Z&@^L3}{j z>(k|Iqug<6yB;ac6QyTB*MIlRWrnq8zIbl!LjV%nM8x@-*6yIj-@UnDPL}1lK7N4- zLv`sYACcdTZ;>7fsx`gdhp_9lGJiTi5FU}tEq5lt%>4G8Tg<0tmMovle%_Kha65mR zQO&ruD*7}0jb&euIiGlZX@$jU{#aERqjnS$3R)oqk{^yso#lhX-0Y==1$Nl)hT&03 zCt9Bj-{gEjXVjH~=>B8*BxNJbag8cLe_q@g{6eb#z@!_thg@<%u$U|iu(YsJSQGv5 zosIyI0#B)JImHxJSwO*%=qjOzawW4f!W`nT+~hknKR>izPxh|SE+;W2bXX4GEI9U8 zOQ8y0%w_c6{)0XdxEH?b?W)o~*@1b@tGR~?Q=M&V+i-gfzge5Q_WI|qk)@g{&{Phk zUG9uEP4J*~m;cMBx7KXhbZ_jmEt#BUtwM#QfylaZg#_`NZW|q!CE?UY-bN&Tn0#N= z$_Rd=tZYng|G|WQv_We-#uZD+nvF4*#KarRAC&yXOq1R#|Ei%^ZDIKN1=w+$KUwI- zw|IL|dpIXbv2Jy0!)@vRHwV@!xEAZl;OuowIP{T-sArfPdjM58@IFJ%G1)FDb2El# z3B;=BtACiego>yZ6eKsE;TAVK1*c`+t*>CJZ2tG-Fg3>ncNVPWt?CI4i=Unz4H<_W zqw8(D=En68PPkLDA^wIvG!P~)<>#FZ_lu=v8;QJ-D?E2bFWZ_L7dAg=?K%d#(Y{tu z9sylJBCO^FH5@yv{}uFXmq`q73j*<+goQooPFmrXICSyqD3>Mghe=H(jWht+?8QSf zP?brC=a87oNk0+X3U_={eA`>^ytNiAiK~BRR+BS8dm$K}@TO#<{GAvA$W`|6U<7l7 z(;#JTSkA`g5AI#OE=3bXY7eH6j0nz#_zSM2bHitx1~MkBHimYwid4DTQ_y5< XkOl&JXOzl1x006-8E{TFc@$+ z9En8g>FGH;I}->5GMSuNbTTs%%LRk$^GRqldeh0+*tjyCh(4eS0)P+2cn=6fXIoZP zxNMrkdn<(BH^+Fndjs|#UsE=R_C%t8jAQ6Ia&&l9OnBs30H9Uoj@l?ZM8o9YPGU3g ztE1ehTEleMbJfdzB509%$jeb4rtuD)A(zM93^H=d*8IGz_x-#mnak?loram&?Qo_YOQo2+>T51h z8a!EyMh;prZZIE`8KwqpcN2BzHEhWNc@9FaoldWD6HUqU55Og;twER8{M#}t0LVSV zJ02v`Duve;qIuS^jH5Dpb&MGI@gbN};a42xAkUKLE?dA@G`d>Fsm95->F**ToZkEn z0N}g(mO{snsjH2hi#itEH(-hFnU)RcmI&GVyjWjo;C!47S$5zni&qrn1XlH0$V|uT zbWXEZ^ST#Sl!}*_OSj|e-8xmC0{;2^)+w)3DEVi!pu7GC2Vd$)qQiLwD5$4aHgwh{ zzt0>GN&(k3)+B8{scjYI7NwhVqI7GuySaXydUaE84CvKA?1p))+dOaK5_)k35_QY( z4ZZx;V^6c-qv!yZXybcRe!v6xT4_YA!PBEYQD79kXW}|03T*F~3l!@cT=2JXt-d&Z zhF_WWvZ}pw-cLg#?M)S-WF|^Dl?$qmUt(~U)VQKw(4z)|vfPxqJ1Hz`!Vh^i<+JMW z?R=k7F#WI5Am_Lpeyn7xHlko*Esi(y%Y2GlS;d0#`gDz)+&OnT=`TJ~Gtz!w!>sc- zfmWO08l{9C_$pa#`Te52Hd+P3J>8RI{waXY>egkU4^uXTnPW2{vtKNXL&MZ+{sSuv zjdu!FlbD|mK9N@-O1>xF@^6y2C?iSzbTD`1ACGp5PwGfRTyjW}TN@5BCzi{+`J3X4 zs>B50_#s~>1SmU!)R&{7H#F78*iP&H+q!$LgWK?7)X!B_%=f!Z;VTc-rPI;&{48q2 ze%!@MwJo!v5;OirC@P|P(uh_!Y@Lx_R*zTknFn%!<>B)NGV&#*x)7|cH+eSgW*WAn z=Lsz`W$|TN?OAFii|VhQpsYCi^ASUF+krzF{e8A>W<%f72uV>Yc&+kdn)Sntfep6G z*Lqd|w9VXcdGJJd$EC8~@@KEkf4sk#uF<%fXyPD+&BeSZnl6-OpUPxY{!G5L1R;B@ z`ZZcwO26)0pMF%*?tRU0(fMBXz3q5Wf<|k}q@fri5_)kUuDq7zp4$>d%58h!Uf6uE z+z)m7gpo3384sDU;b3!Y^ox50%Wj*k>&wV&1y?p)BmB(v}&sRTVjhV9EUQDFk@j0u8 z9WGhz^r@^gRfnp$eWwQrmvfK@w~q_b6b(^r=G0GQnnLwyHGyu><6C3TY~GLPbnG=` zZ0ih5{j3hVDXwaH9HRaA=b@SdySC}o4oy*~5#11BOa8m!W42Mnk%2t{52|%ctLWd% zT|X|rEVlblPiY|?`r$|bAP(h9zDT>fu%ya<>4gM^1@VAMGlwM5u0UyBS`csV$fJ73 zzwRznojMVogk6oyUA{a{e-usKiMw$N%Z%On$0Ys8K-Y}83<#+cm5d9{A+q%?b4&_9 z#Nbmq%27?6wc_Odqd^BhIF*<2hYvOGdGfBFsNikpc%^ID+oDFBN-mZp7nf}B4kd8~H}nhj3L5TvG20*?WVZ%Zu!zU&Ieq}V2`XI?b+vGq=#@3t z`hzn`8|l|s^^&g>k}uh{Ead-$N*z==*7SwITj_3Vh8CYK4kG_iJ{s8mUgsZ|U(+gP z2^a)L{&~0x_Z~E-4yNd$@u8EZFA2{Q?8$8I9Au!6c#jwtD38?)u=RB-S8P<_CtJDS zpV|Lm-#}v018b*L$Bwf+={JpIbk2+AiU|Q{R(d`!ncsn>zpG(!;3A7dtVmBLDCaqD UQB4sZlYIBUA9i Date: Sat, 2 Jun 2018 15:22:05 -0500 Subject: [PATCH 10/19] Merge pull request #5320 from VOREStation/pol-hoods Radiation closet hood fix --- .../structures/crates_lockers/closets/utility_closets.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 56f8d6790d..a4ed511f4b 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -153,7 +153,8 @@ icon_closed = "radsuitcloset" starts_with = list( - /obj/item/clothing/suit/radiation = 4, + /obj/item/clothing/suit/radiation = 2, + /obj/item/clothing/head/radiation = 2, /obj/item/device/geiger = 2) /* From 76c8e20e2abedefe82648ac53095006149b8f425 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 3 Jun 2018 00:58:07 -0700 Subject: [PATCH 12/19] Merge pull request #5301 from Anewbe/more_merc_mob_things Adds armor to certain mobs, mercs have knives --- .../mob/living/simple_animal/aliens/drone.dm | 1 + .../simple_animal/humanoids/mechamobs.dm | 4 +- .../simple_animal/humanoids/syndicate.dm | 10 ++++- html/changelogs/Anewbe - More Merc PoIs.yml | 37 +++++++++++++++++++ 4 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/Anewbe - More Merc PoIs.yml diff --git a/code/modules/mob/living/simple_animal/aliens/drone.dm b/code/modules/mob/living/simple_animal/aliens/drone.dm index 35e09030dd..e51dfd82a7 100644 --- a/code/modules/mob/living/simple_animal/aliens/drone.dm +++ b/code/modules/mob/living/simple_animal/aliens/drone.dm @@ -27,6 +27,7 @@ destroy_surroundings = 0 hovering = TRUE + armor = list(melee = 25, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 100) // Some level of armor plating makes sense //Drones aren't affected by atmos. min_oxy = 0 max_oxy = 0 diff --git a/code/modules/mob/living/simple_animal/humanoids/mechamobs.dm b/code/modules/mob/living/simple_animal/humanoids/mechamobs.dm index c7645d2352..9f8c737894 100644 --- a/code/modules/mob/living/simple_animal/humanoids/mechamobs.dm +++ b/code/modules/mob/living/simple_animal/humanoids/mechamobs.dm @@ -31,6 +31,8 @@ attacktext = list("slashed") attack_sound = 'sound/weapons/bladeslice.ogg' + armor = list(melee = 40, bullet = 40, laser = 50, energy = 45, bomb = 20, bio = 100, rad = 100) // As close to the actual Dark Gygax as possible + min_oxy = 0 max_oxy = 0 min_tox = 0 @@ -43,7 +45,7 @@ ranged = 1 rapid = 1 - projectiletype = /obj/item/projectile/beam + projectiletype = /obj/item/projectile/beam/midlaser projectilesound = 'sound/weapons/laser.ogg' speak_chance = 1 diff --git a/code/modules/mob/living/simple_animal/humanoids/syndicate.dm b/code/modules/mob/living/simple_animal/humanoids/syndicate.dm index 6a7a260802..dfeea36cfe 100644 --- a/code/modules/mob/living/simple_animal/humanoids/syndicate.dm +++ b/code/modules/mob/living/simple_animal/humanoids/syndicate.dm @@ -29,10 +29,14 @@ response_harm = "hits" harm_intent_damage = 5 - melee_damage_lower = 10 + melee_damage_lower = 15 //Tac Knife damage melee_damage_upper = 15 environment_smash = 1 - attacktext = list("punched") + attack_sharp = 1 + attack_edge = 1 + attacktext = list("slashed", "stabbed") + + armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 100) // Same armor values as the vest they drop, plus simple mob immunities min_oxy = 5 max_oxy = 0 @@ -119,6 +123,8 @@ speed = 0 + armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 100) // Same armor as their voidsuit + min_oxy = 0 max_oxy = 0 min_tox = 0 diff --git a/html/changelogs/Anewbe - More Merc PoIs.yml b/html/changelogs/Anewbe - More Merc PoIs.yml new file mode 100644 index 0000000000..d13768b1e0 --- /dev/null +++ b/html/changelogs/Anewbe - More Merc PoIs.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 +################################# + +# Your name. +author: Anewbe + +# 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: "Certain mobs, namely robots and mercs, now have some amount of armor." + - rscadd: "Ranged mercs will now knife people when cornered, rather than punch them really hard." From d755dfd2b84e9412288522accb3dc6f3fb52b768 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 4 Jun 2018 15:07:49 -0500 Subject: [PATCH 14/19] Merge pull request #5327 from Cameron653/patch-2 Changes "Setup Character" to "Character Setup" --- code/modules/mob/new_player/new_player.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index afcdacf148..ed5c11163b 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -28,7 +28,7 @@ /mob/new_player/proc/new_player_panel_proc() var/output = "
" output +="
" - output += "

Setup Character

" + output += "

Character Setup

" if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) if(ready) From 1800e1696fcca3b2efb98569361248c0332aac5f Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 4 Jun 2018 15:13:19 -0500 Subject: [PATCH 16/19] Merge pull request #5325 from elgeonmb/patch-7 Changes experimental welder fluff --- code/game/objects/items/weapons/tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index e89ce66774..9a8937adbc 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -685,7 +685,7 @@ /obj/item/weapon/weldingtool/experimental name = "experimental welding tool" - desc = "An experimental welder capable of self-fuel generation. It can output a flame hotter than regular welders." + desc = "An experimental welder capable of synthesizing its own fuel from waste compounds. It can output a flame hotter than regular welders." icon_state = "exwelder" max_fuel = 40 w_class = ITEMSIZE_NORMAL From 6e99a135e3a0e743a865264409b99f641f81703f Mon Sep 17 00:00:00 2001 From: Mechoid Date: Mon, 4 Jun 2018 13:13:10 -0700 Subject: [PATCH 18/19] Ion Rifle returned to original radius. (#5326) * Return ion rifles to their intended 3x3 rather than 5x5. * Changelog --- .../modules/projectiles/projectile/special.dm | 2 +- html/changelogs/Mechoid - Ionrifle.yml | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Mechoid - Ionrifle.yml diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index f7ecddb0eb..2e27d125ef 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -15,7 +15,7 @@ var/sev1_range = 0 var/sev2_range = 1 var/sev3_range = 1 - var/sev4_range = 2 + var/sev4_range = 1 /obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0) empulse(target, sev1_range, sev2_range, sev3_range, sev4_range) diff --git a/html/changelogs/Mechoid - Ionrifle.yml b/html/changelogs/Mechoid - Ionrifle.yml new file mode 100644 index 0000000000..3be45359a2 --- /dev/null +++ b/html/changelogs/Mechoid - Ionrifle.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: Mechoid + +# 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: + - bugfix: "Ion rifles hit the correct 3x3 instead of 5x5"