From e03da3958b357b61eb8485b65094bcd4f8797bea Mon Sep 17 00:00:00 2001 From: yourdoom9898 <32888098+yourdoom9898@users.noreply.github.com> Date: Thu, 2 Mar 2023 11:43:31 -0600 Subject: [PATCH 1/5] Re-adds Medical Borg pinpointer (#63) --- code/modules/research/designs/mechfabricator_designs.dm | 2 -- code/modules/research/techweb/all_nodes.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 2f1d479160f..9364cceedbb 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -1205,7 +1205,6 @@ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL ) -/* //SKYRAT REMOVAL START /datum/design/borg_upgrade_pinpointer name = "Crew Pinpointer" id = "borg_upgrade_pinpointer" @@ -1216,7 +1215,6 @@ category = list( RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL ) -*/ //SKYRAT REMOVAL END /datum/design/borg_upgrade_broomer name = "Experimental Push Broom" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 24f373ffeb5..a4267364b80 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1015,7 +1015,7 @@ "borg_upgrade_defibrillator", "borg_upgrade_expandedsynthesiser", "borg_upgrade_piercinghypospray", - //"borg_upgrade_pinpointer", // SKYRAT EDIT REMOVAL + "borg_upgrade_pinpointer", "borg_upgrade_surgicalprocessor", //SKYRAT EDIT START - RESEARCH DESIGNS From 6ce49c7db5f6c56674b19b0db355c80601c1b826 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 17:44:03 +0000 Subject: [PATCH 2/5] Automatic changelog for PR #63 [ci skip] --- html/changelogs/AutoChangeLog-pr-63.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-63.yml diff --git a/html/changelogs/AutoChangeLog-pr-63.yml b/html/changelogs/AutoChangeLog-pr-63.yml new file mode 100644 index 00000000000..8295e39da0b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-63.yml @@ -0,0 +1,4 @@ +author: "yourdoom9898" +delete-after: True +changes: + - rscadd: "Medical cyborg crew pinpointer uncommented" \ No newline at end of file From ec5604786fe06179c7b78919fdc7159fa682964b Mon Sep 17 00:00:00 2001 From: JimmyDrop <85446983+ShamanSliph@users.noreply.github.com> Date: Thu, 2 Mar 2023 16:55:38 -0500 Subject: [PATCH 3/5] Hemophage, More like :zzz: phage --- ...hot_humanoids__datum_species_hemophage.png | Bin 1113 -> 1125 bytes .../living/carbon/human/species/hemophage.dm | 1 + 2 files changed, 1 insertion(+) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png index 8c87cff723765f1bb13f31b3c27f6edd90a631e8..6e9c034a5c0fd1d68fd70d0e6ca67333569587dc 100644 GIT binary patch delta 968 zcmV;(12_EH2;~TnB!7@lOjJd{z`zm`5*8K~7#J8D8X6rP9sl&^l)ttB006|iv5AR^ z@aEXCu(0IX&dkHOH8??zkdqo3Ay!&rv$L~wcYyis;dgt3QBPYqHa6PP#hI9OH8mzc zKrhe6yM&u;zqhOr6ci#RCKwzXr>eHf!M1yPTO=eZEiE(4&5@T44d~v{wyvbq*WYaj zOO27MfqxQ7L_t(oh3%HzQrj>Pg%!&(2m_L3wW>pa5Q+&-NZGlG!(DT zgVoPebB;@CM%PEc83(win-*8i0%{qjc){qGLVvec*Hbv< zUl?n(*47$E@2oPoY{%t0)B7*J$9q2CnXfdA%M-kHeQ&+(duM%CH_jp7Im75Z06p^Y zo{50ofq-GUoGyHC9fATxXZsAGx27{)hhM|!0YdLlgb8Ux)Ln-HuoM{`6?)^30Q!^w z@PC(i2AG3LbrF0J5%7&BNZ%42PiM|Y35hOrGiX%SFK=#EOFcC2x07yeY4&jqO?R8< z2xy1ktzF*T-7JT8NCEnuR?yHo-s?oiCT{flVe>dwkZx$*e%I^G2HBg?E(CIHux-IF`GLWh5Vy?sybugvVK!p!kk~{^JhX`Bt!rlnsrB;O=nxnJ&do+D1hIg{rKTR|n$xdI)dTw^m6Vr=D6T=%3{o;(k})cH z{IkBY6^d8LJ}8s*f0)0+sa-fTXN&GSn0$tSeE4>6O9aZtvD}#q0lwSeG_!#q9DtJN zAeVG0WLwaJ$1Mr~+xb97kMOjDXn*_mR0VeK6p{)|1XwDd2tWxo0^TnInLnMEwg^D; zU@6L_ogA5eIG`^m0hZ+4&2R|RBfJ-}ECd)z-nXRQfdJ_mM#TCs4Eo{W@kgtwH5~e0000;38CB( z;!DS-s$?-hR@J5;SG7{AM3B(ys;n!;2UJNfTtTJ^YF4j50;qIKXYKQGl)uqnlc$TfAlTJAYxUZnfp|h3I6psbq&pj?ihXJ2qb^nO%C+2-YbWf@45WJjlqTypZWa3eWT%qJR$gD9DVTPIQWp&-7p}37#yRI0F21TXC?xA z4+4hkbGitl9}pBF4t~r4M(=vp_xN{=9wCeYMYy<*NczyD08B+jM}@(K1%E(CD*(Qk z?*R88*1CuxiUjyhH%MnI9ZzS@M+qxkw7NB@Y~0=7?{@}gYn|>s&7tepIs$APgZI0K zhx=V?R{_QvLo?`T9*tSA_s+KF@OXS$DzNVtbkdJUWFL=*jE;y-PzC$v=jT10taOuf z4BWrT|6phm=`Xj={zj)~9e;3@%qn>UB)tfTBDY9>0Z@I+tbu{@^!j?5&f+}LK~_IcNuSPHU0hD5%jGJr7drTa{#66U0e{Z+02`RIEVc*m z@7dt9gw1U3U=;Ef_f&Pp!e#xYvV=Lm&gajBx=2WXy5Zfi(@kA0fq$;i=q+o{W~&>n zzBFo6D~T3?DWQWT6@pm6<_;Y~)9@9b{jkQePf|&FXRX#eKx=EQluVc8oQeTI)0%S0>JknlF=i4U4KEceg9Dfe(n@j6}SZOR6r4c5_|%@p9C_0+An<(fabwd)UfX4 z$owNU2?XGl@^0xJBJ~LGRZL4XSg7QE%u+Nv^bT0;Ca&i&Ar908JU%}CC|6*+1JkR< z(3zrrqj}hS)2$n%--KfR(joBqL@4GbLMi`0fB@K%&LzMZ8#7V~kj%e8IL|#oDS(=T oD<@x<9)cgU`SXCKNBDF61g`*7i_@% diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm index be4cf10d001..d5b9d3afdf6 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm @@ -290,6 +290,7 @@ human.skin_tone = "albino" human.hair_color = "#1d1d1d" human.hairstyle = "Pompadour (Big)" + human.dna.features["mcolor"] = "#fff4e6" //Bubber Edit human.update_mutant_bodyparts(TRUE) human.update_body(TRUE) From 7d0201a9615e486a8cba89b70ceec4a7248cb96b Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 3 Mar 2023 00:07:41 -0600 Subject: [PATCH 4/5] Adds enemy_roles to all midround and latejoin antags (#60) * Adds enemy_roles to all midround and latejoin antags Add: enemy_roles to all midround antags * Fixes formatting for latejoins * Fixes formatting on midround --- .../dynamic/dynamic_rulesets_latejoin.dm | 19 ++++++++++- .../dynamic/dynamic_rulesets_midround.dm | 34 ++++++++++++++++++- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 40dc56ee5da..96b0d4a9589 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -75,6 +75,15 @@ JOB_AI, JOB_CYBORG, ) + enemy_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 7 cost = 5 @@ -110,7 +119,6 @@ ) enemy_roles = list( JOB_AI, - JOB_CYBORG, JOB_CAPTAIN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, @@ -202,6 +210,15 @@ JOB_AI, JOB_CYBORG, ) + enemy_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 4 cost = 6 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 891f58c1736..ff4994bf16e 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -240,6 +240,15 @@ JOB_CYBORG, ROLE_POSITRONIC_BRAIN, ) + enemy_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 35 cost = 3 @@ -376,7 +385,6 @@ antag_datum = /datum/antagonist/nukeop enemy_roles = list( JOB_AI, - JOB_CYBORG, JOB_CAPTAIN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, @@ -552,6 +560,14 @@ antag_datum = /datum/antagonist/nightmare antag_flag = ROLE_NIGHTMARE antag_flag_override = ROLE_ALIEN + enemy_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 3 @@ -803,6 +819,14 @@ midround_ruleset_style = MIDROUND_RULESET_STYLE_HEAVY antag_flag = "Space Pirates" required_type = /mob/dead/observer + enemy_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 0 weight = 4 @@ -830,6 +854,14 @@ JOB_CYBORG, ROLE_POSITRONIC_BRAIN, ) + enemy_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 4 From f970599ba6566be788be9212560cf3a55bc8ade5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 3 Mar 2023 17:20:24 +0000 Subject: [PATCH 5/5] Automatic changelog for PR #68 [ci skip] --- html/changelogs/AutoChangeLog-pr-68.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-68.yml diff --git a/html/changelogs/AutoChangeLog-pr-68.yml b/html/changelogs/AutoChangeLog-pr-68.yml new file mode 100644 index 00000000000..17059ffe7e8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-68.yml @@ -0,0 +1,4 @@ +author: "ShamanSliph" +delete-after: True +changes: + - bugfix: "fixed Hemophage preview." \ No newline at end of file