From 3b3e07c13f7fffe1e4b5533744efdf50bcbb8cd4 Mon Sep 17 00:00:00 2001 From: mirrormagic1 Date: Sun, 24 Apr 2022 15:42:12 -0400 Subject: [PATCH 1/7] Update README.md --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6aebbdd0..90e87e06 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,11 @@ -## Hyper Station 13 +## Gain Station 13 -Based and maintained from Citadel Station. +Based and maintained from Citadel Station, Hyperstation, and others. ## Warning you will need Byond Compiler [513.1525] or higher to compile the source code. [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a) -[![Krihelimeter](http://www.krihelinator.xyz/badge/quotefox/Hyper-Station-13)](http://www.krihelinator.xyz) - -[![Percentage of issues still open](http://isitmaintained.com/badge/open/quotefox/Hyper-Station-13.svg)](http://isitmaintained.com/project/quotefox/Hyper-Station-13 "Percentage of issues still open") [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/quotefox/Hyper-Station-13.svg)](http://isitmaintained.com/project/quotefox/Hyper-Station-13 "Average time to resolve an issue") **Hyper Station Information** **Website:** http://hyperstation13.com From 75217666135f394d6360f1b450d259410cafaa81 Mon Sep 17 00:00:00 2001 From: mirrormagic1 Date: Sun, 24 Apr 2022 15:51:26 -0400 Subject: [PATCH 2/7] Update README.md Added the Discord link to the readme. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 90e87e06..892222a5 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Based and maintained from Citadel Station, Hyperstation, and others. +Discord: [Here](https://discord.gg/s9ZSjSbf) + ## Warning you will need Byond Compiler [513.1525] or higher to compile the source code. [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a) From 2a33f334876e8c06f5ffbd902acddee4559655ab Mon Sep 17 00:00:00 2001 From: mirrormagic1 Date: Sun, 24 Apr 2022 18:38:35 -0400 Subject: [PATCH 3/7] Killer dildo addition Added a killer dildo, Will kill you if you suicide with it twice. Does 100 brute, 20 oxy dmg, and stuns for 400 ticks. item id: "obj/item/dildo/flared/killer" Added the killer dildo sprite "dildo_flared_6" --- .../code/modules/arousal/toys/dildos.dm | 21 +++++++++++++++++- modular_citadel/icons/obj/genitals/dildo.dmi | Bin 1056 -> 1151 bytes 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/arousal/toys/dildos.dm b/modular_citadel/code/modules/arousal/toys/dildos.dm index 17d77071..f67e8584 100644 --- a/modular_citadel/code/modules/arousal/toys/dildos.dm +++ b/modular_citadel/code/modules/arousal/toys/dildos.dm @@ -129,6 +129,13 @@ obj/item/dildo/flared/gigantic desc = "You can barely carry this thing! Meant for... \"advanced\" interrogation techniques." dildo_size = 5 attack_verb = list("penetrated", "slapped", "gaped", "prolapsed", "inseminated", "destroyed", "broke", "demolished", "whacked") +//killerdildokillerdildo +obj/item/dildo/flared/killer + name = "bitch killer" + desc = "The fact you're able to carry this is insane. Initally made to be used as a new death penalty, Using this will definitely kill you." + dildo_size = 6 + attack_verb = list("penetrated", "beat", "gaped", "prolapsed", "destroyed", "broke", "demolished", "whacked", "bruised", "tore") + obj/item/dildo/custom name = "customizable dildo" @@ -138,6 +145,7 @@ obj/item/dildo/custom random_shape = TRUE random_size = TRUE + // Suicide acts, by request /obj/item/dildo/proc/manual_suicide(mob/living/user) @@ -173,4 +181,15 @@ obj/item/dildo/custom user.adjust_eye_damage(20) user.adjustOxyLoss(15) return MANUAL_SUICIDE - +// Two tries, then you're dead bud. +/obj/item/dildo/flared/killer/suicide_act(mob/living/user) + if(do_after(user,45,target=src)) + user.visible_message("[user] screams in pain as they insert the [src] into their ass! WHY WOULD THEY DO THAT? It looks like [user.p_theyre()] trying to commit suicide!!") + playsound(loc, 'sound/voice/scream/scream_r.ogg', 50, 2, -1) + playsound(loc, 'sound/lewd/champ_fingering.ogg', 50, 2, -1) + playsound(loc, 'sound/effects/gib_step.ogg', 50, 2, -1) + user.Stun(400) + user.adjust_blurriness(24) + user.adjustBruteLoss(100) + user.adjustOxyLoss(20) + return MANUAL_SUICIDE \ No newline at end of file diff --git a/modular_citadel/icons/obj/genitals/dildo.dmi b/modular_citadel/icons/obj/genitals/dildo.dmi index d383298b2ef20588566ffbec4d2767cf2be7a1a0..024bc0477ddd03070c439ee189614b44bec505b3 100644 GIT binary patch delta 1060 zcmV+<1l#+d2>%F>YJbRjR9JLGWpiV4X>fFDZ*Bkpc$}q^O%B2!5JuN<3es*H(?5+H zH>Qp0!d{^vfeNuL4UBqytGF|mQFk-p@#W1BVz#djP0OldL$A_0Z6>y3j!Q>JtHod-48q8&dve<9Cvhdh~JH@ zEx?|%%a_Z`mVoL_V#c`wI6qT%e1&IbfZTj+2gv$VVo71e%%lvf@WWPc2}DBeW@el~+9WQMMLUcmd} z3m*maCll&&7q!J5q@3Up^4l+%&?z2JJJhBqAR(W40z5uM_4Z7lvu+pk(bx4lsymAX z=;eBiJ7|%daEL?vFCo2_fZ_ZsE#aKjcZ;-%B5>P5lLiRfcK9g~z;0`A;{Z7$&2Fm! zMxP15UVo{IOPe309iA~pIuHEF<{6Q6!8SB z0R}g50I&ZA0JWuxScgY&s4uQhqB^XgrV7kSREHH<)ZByIfKfP1w9dVb*WyI`I6U4Ni~LF#L0;zj-5DFF0)afT`|i4{yem}`FT zd8VPDfkCD-1l-kefEc|0Pp*L7R@?+866+@MCbHjeCz$<*CcBA-A4x<3Qu=cLp^Eie z9UTbh2;%E%|FKTK)6tQH28IAo)m0q@(7?b)&@13D4!)jx4>*>q&Hmgc)>+raT^&2C e)n@ffL(xwQ1myakDZ-)v0000 delta 964 zcmV;#13Ucx2%rd%YJbCeR9JLGWpiV4X>fFDZ*Bkpc$}q^O$x#=5JuO@DMGs~(m%nC zo6;g(*ejGkQWI>Ol8kzNt6559w7VJd^6`>kVpcV$wqy0VrFUtaHZwc2a+gx_&;r!j z6geeI>Wc#3IN%`HG7@?eroYYxK#D$#C=uGa^(3QYuzZrf4uA0Zk9>jT)otQ4+Q!pZ z7f%OGh%(?7^ZKVllBLPV{bl4D@8)T&o2UPG8%A!wjS(9V^u-2jenPo5U>^#IS<}_; zU3mgdb?^wz1wv~800PoUL_t(&f$f>Ujv6r##@VURRs4}i3-%t=w{}7u)+_2raD5VK z>2ncjDd7$7#D5E>6kIfENI;j=extQGJ_0ei7J!3<1~0t0*9>R)1_0G6T;&FWCDOiVy`1%My0E z&$Z<@c3hjHUdTs#&iZ|(J0Fk7sP69fOdpO%K0_+h z32n6TuLKPm0;b!sE@1-W`-QHf5N4FQfqI_jy$X z9RU1Z0=@tMH2S?*!hzen)L`FaE!)+r!|78@i|9U_K1T<%(Z(MdbZ!WkY3*D9>R${n zXRy8$01~L)f}JM-B4L0X3<3rN(2(#9I~V|D^?#QC>|(+U0aL7?h$q+-V6=$?aQq_x zt}RrAS}wtHeSO=DYFWV=DlomMmK9j8aS!sq-%suVcCPs<1%L!KU;t}GZOix`WZtvm zI(hyt3>gE*_x*my0L%G;B`oLc9}Hpt7k}q~;5i_81`rL%)#1qP94bOB02tlV>7Hrm z7k}gulz|}aD**S+KHyg0_NXSUfTE ziGYTImMa~A3_t&?D?qm;SL!Yp(eE!EOg&%qn+O2%!3R|dumlS0ieKxb0vZNA02&7U m5-^Mt{k$#?52wH8R^}@NW4o}V)za4h0000 Date: Sun, 24 Apr 2022 16:26:25 -0700 Subject: [PATCH 4/7] Update belly.dm Adjusted Belly.DM file so it calls to the belly textures in hyperstation. --- modular_citadel/code/modules/arousal/organs/belly.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/arousal/organs/belly.dm b/modular_citadel/code/modules/arousal/organs/belly.dm index b4fb7d02..44306efa 100644 --- a/modular_citadel/code/modules/arousal/organs/belly.dm +++ b/modular_citadel/code/modules/arousal/organs/belly.dm @@ -2,7 +2,7 @@ name = "belly" desc = "You see a belly on their midsection." icon_state = "belly" - icon = 'modular_citadel/icons/obj/genitals/breasts.dmi' + icon = 'hyperstation/icons/obj/genitals/belly.dmi' zone = "chest" slot = "belly" w_class = 3 From 624279f3b1f2461f06f4e6ca7ca0d8f905ead704 Mon Sep 17 00:00:00 2001 From: mirrormagic1 Date: Sun, 24 Apr 2022 20:19:56 -0400 Subject: [PATCH 5/7] Update dildos.dm Added the missing size adjective to the if statement. --- modular_citadel/code/modules/arousal/toys/dildos.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modular_citadel/code/modules/arousal/toys/dildos.dm b/modular_citadel/code/modules/arousal/toys/dildos.dm index f67e8584..22103e4f 100644 --- a/modular_citadel/code/modules/arousal/toys/dildos.dm +++ b/modular_citadel/code/modules/arousal/toys/dildos.dm @@ -33,6 +33,8 @@ sizeword = "huge " if(5) sizeword = "gigantic " + if(6) + sizeword = "herculean " name = "[sizeword][dildo_shape] [can_customize ? "custom " : ""][dildo_type]" From 755c193e8c01b0687f5bb8a62b847c75f573094a Mon Sep 17 00:00:00 2001 From: simplysable Date: Sun, 24 Apr 2022 22:20:03 -0700 Subject: [PATCH 6/7] Update dildos.dm Added Stun Time and BruteLoss for the "killer dildo". when user uses "suicide" verb they climax instantly. --- modular_citadel/code/modules/arousal/toys/dildos.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/arousal/toys/dildos.dm b/modular_citadel/code/modules/arousal/toys/dildos.dm index 22103e4f..aea1f9b1 100644 --- a/modular_citadel/code/modules/arousal/toys/dildos.dm +++ b/modular_citadel/code/modules/arousal/toys/dildos.dm @@ -190,8 +190,9 @@ obj/item/dildo/custom playsound(loc, 'sound/voice/scream/scream_r.ogg', 50, 2, -1) playsound(loc, 'sound/lewd/champ_fingering.ogg', 50, 2, -1) playsound(loc, 'sound/effects/gib_step.ogg', 50, 2, -1) - user.Stun(400) + user.mob_climax(forced_climax=TRUE) + user.Stun(300) user.adjust_blurriness(24) - user.adjustBruteLoss(100) + user.adjustBruteLoss(85) user.adjustOxyLoss(20) return MANUAL_SUICIDE \ No newline at end of file From b5268a00c6dd3ec590bef26135ae0e5e29fd2f1e Mon Sep 17 00:00:00 2001 From: simplysable Date: Sun, 24 Apr 2022 22:35:37 -0700 Subject: [PATCH 7/7] Removed Dogborgs This removes all of the dogborg options from the game and the upgrades that are tied to them. (Players can no longer turn into a dogborg) Did someone call for an exterminator? --- .../objects/items/robot/robot_upgrades.dm | 14 +++---- .../mob/living/silicon/robot/robot_modules.dm | 40 ++++++++++--------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 47974b46..c53bc122 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -415,9 +415,9 @@ icon_state = "cyborg_upgrade3" require_module = 1 module_type = list( - /obj/item/robot_module/medical, - /obj/item/robot_module/medihound) - + /obj/item/robot_module/medical) //had to move parantheses to close the list argument not inluding the medhihound here. + // /obj/item/robot_module/medihound //Removes the Medihound hypospray upgrade + var/list/additional_reagents = list() /obj/item/borg/upgrade/hypospray/action(mob/living/silicon/robot/R, user = usr) @@ -502,8 +502,8 @@ icon_state = "cyborg_upgrade3" require_module = 1 module_type = list( - /obj/item/robot_module/medical, - /obj/item/robot_module/medihound) + /obj/item/robot_module/medical) //Had to close list parantheses here to not include medihound + ///obj/item/robot_module/medihound //Removes Medihound surgical processor upgrade /obj/item/borg/upgrade/processor/action(mob/living/silicon/robot/R, user = usr) . = ..() @@ -525,8 +525,8 @@ icon_state = "cyborg_upgrade3" require_module = 1 module_type = list( - /obj/item/robot_module/medical, - /obj/item/robot_module/medihound) + /obj/item/robot_module/medical) //Closed list parantheses again to not include Medihound + ///obj/item/robot_module/medihound /obj/item/borg/upgrade/advhealth/action(mob/living/silicon/robot/R, user = usr) diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm index e4f4c11a..be680644 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -1,3 +1,4 @@ +/* /mob/living/silicon/robot/modules/medihound set_module = /obj/item/robot_module/medihound @@ -9,14 +10,15 @@ /mob/living/silicon/robot/modules/borgi set_module = /obj/item/robot_module/borgi +*/ //I don't know what removing this does but I don't like it (I think this disables turning someone into a dogborg) /mob/living/silicon/robot/proc/get_cit_modules() var/list/modulelist = list() - modulelist["MediHound"] = /obj/item/robot_module/medihound - if(!CONFIG_GET(flag/disable_secborg)) - modulelist["Security K-9"] = /obj/item/robot_module/k9 - modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup - modulelist["Borgi"] = /obj/item/robot_module/borgi + //modulelist["MediHound"] = /obj/item/robot_module/medihound //removes the Medihound Call code + //if(!CONFIG_GET(flag/disable_secborg)) + //modulelist["Security K-9"] = /obj/item/robot_module/k9 //removes Secborg call code? + //modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup //removes the scrubpup call code + //modulelist["Borgi"] = /obj/item/robot_module/borgi //removes the borgi callcode return modulelist /obj/item/robot_module @@ -39,7 +41,7 @@ if(user.incapacitated() || !user.Adjacent(src)) return FALSE return TRUE - +/* /obj/item/robot_module/k9 name = "Security K-9 Unit" basic_modules = list( @@ -103,8 +105,8 @@ special_light_key = "alina" sleeper_overlay = "alinasleeper" return ..() - -/obj/item/robot_module/medihound +*/ //removes Security K9 +/* /obj/item/robot_module/medihound name = "MediHound" basic_modules = list( /obj/item/assembly/flash/cyborg, @@ -178,8 +180,8 @@ special_light_key = "alina" sleeper_overlay = "alinasleeper" return ..() - -/obj/item/robot_module/scrubpup +*/ // Removes the Mediborg Selection code +/* /obj/item/robot_module/scrubpup name = "Scrub Pup" basic_modules = list( /obj/item/assembly/flash/cyborg, @@ -232,8 +234,8 @@ /obj/item/robot_module/scrubpup/do_transform_animation() ..() to_chat(loc,"As tempting as it might be, do not begin binging on important items. Eat your garbage responsibly. People are not included under Garbage.") - -/obj/item/robot_module/borgi +*/ //removes scrubpup module from the game +/* /obj/item/robot_module/borgi name = "Borgi" basic_modules = list( /obj/item/assembly/flash/cyborg, @@ -260,7 +262,7 @@ hat_offset = INFINITY cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' has_snowflake_deadsprite = TRUE - +*/ //removes Borgi from the game /* /obj/item/robot_module/orepup name = "Ore Pup" @@ -567,7 +569,7 @@ "BootyM" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootyengineerM"), "BootyS" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "bootyengineerS") ) - var/list/L = list("Pupdozer" = "pupdozer", "Engihound" = "Engihound") + /*var/list/L = list("Pupdozer" = "pupdozer", "Engihound" = "Engihound") for(var/a in L) var/image/wide = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = L[a]) wide.pixel_x = -16 @@ -575,7 +577,7 @@ if(R.client?.ckey == "nezuli") var/image/bad_snowflake = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "alina-sec") bad_snowflake.pixel_x = -16 - eng_models["Alina"] = bad_snowflake + eng_models["Alina"] = bad_snowflake*/ //removes pupdozer,engihound (this option doesn't work anyways) eng_models = sortList(eng_models) var/eng_borg_icon = show_radial_menu(R, R , eng_models, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE, tooltips = TRUE) if(!eng_borg_icon) @@ -609,22 +611,22 @@ if("Heavy") cyborg_base_icon = "heavyeng" cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' - if("Pup Dozer") + /*if("Pup Dozer") cyborg_base_icon = "pupdozer" can_be_pushed = FALSE hat_offset = INFINITY cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' has_snowflake_deadsprite = TRUE dogborg = TRUE - cyborg_pixel_offset = -16 - if("Engihound") + cyborg_pixel_offset = -16*/ //Removes pupdozer display + /*if("Engihound") cyborg_base_icon = "valeeng" can_be_pushed = FALSE cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' has_snowflake_deadsprite = TRUE sleeper_overlay = "valeengsleeper" dogborg = TRUE - cyborg_pixel_offset = -16 + cyborg_pixel_offset = -16 */ //Removes Engihound display if("Alina") cyborg_base_icon = "alina-eng" special_light_key = "alina"