diff --git a/README.txt b/README.txt index 7ac8f3f1398..d7261e6cb04 100644 --- a/README.txt +++ b/README.txt @@ -6,5 +6,8 @@ Install Guide: http://baystation12.net/wiki/index.php/Install Code: https://github.com/Baystation12/Baystation12 IRC: irc://irc.sorcery.net/bs12 -Based on the code of tgstation13, itself based on the code of goonstation13. -tgstation13 - http://code.google.com/p/tgstation13 \ No newline at end of file +Based on the code of /tg/ station 13, itself based on the code of Goon Station 13. +/tg/ station 13: http://code.google.com/p/tgstation13 + +Code Licensed Under GPLv3: http://www.gnu.org/licenses/gpl.html +Content Licensed Under Creative Commons CC BY-SA 3.0: http://creativecommons.org/licenses/by-sa/3.0/ \ No newline at end of file diff --git a/code/WorkInProgress/virus2/base.dm b/code/WorkInProgress/virus2/base.dm index ce2aec42040..4bd30bf08ca 100644 --- a/code/WorkInProgress/virus2/base.dm +++ b/code/WorkInProgress/virus2/base.dm @@ -113,7 +113,7 @@ proc/airborne_can_reach(turf/source, turf/target) var/infectionchance = 10 var/speed = 1 var/spreadtype = "Blood" // Can also be "Airborne" - var/stage = 1 + var/stage = 0 var/stageprob = 10 var/dead = 0 var/clicks = 0 @@ -225,7 +225,7 @@ proc/airborne_can_reach(turf/source, turf/target) if(mob.reagents.has_reagent("virusfood")) mob.reagents.remove_reagent("virusfood",0.1) clicks += 10 - if(clicks > stage*100 && prob(10)) + if(clicks > (stage+1)*100 && prob(10)) if(stage == 4) var/datum/disease2/resistance/res = new /datum/disease2/resistance(src) src.cure(mob) @@ -246,13 +246,13 @@ proc/airborne_can_reach(turf/source, turf/target) if(stage>1) E = effects[1] E.effect.deactivate(mob) - if(stage>2) + if(stage>=2) E = effects[2] E.effect.deactivate(mob) - if(stage>3) + if(stage>=3) E = effects[3] E.effect.deactivate(mob) - if(stage>4) + if(stage>=4) E = effects[4] E.effect.deactivate(mob) @@ -272,6 +272,7 @@ proc/airborne_can_reach(turf/source, turf/target) disease.spreadtype = spreadtype disease.stageprob = stageprob disease.antigen = antigen + disease.uniqueID = uniqueID for(var/datum/disease2/effectholder/holder in effects) // world << "adding effects" var/datum/disease2/effectholder/newholder = new /datum/disease2/effectholder diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 6f19d956a4c..d79785eb823 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -242,6 +242,7 @@ client if(ishuman(D)) body += "" body += "" + body += "" body += "" body += "" body += "" @@ -670,6 +671,23 @@ client usr << "Mob doesn't exist anymore" return holder.Topic(href, list("makeai"=href_list["makeai"])) + else if (href_list["makeaisilent"]) + var/mob/M = locate(href_list["makeaisilent"]) + if(!M) + return + if(!ishuman(M)) + usr << "This can only be done to objects of type /mob/living/carbon/human" + return + if(!src.holder) + usr << "You are not an administrator." + return + var/action_type = alert("Confirm mob type change?",,"Transform","Cancel") + if(!action_type || action_type == "Cancel") + return + if(!M) + usr << "Mob doesn't exist anymore" + return + holder.Topic(href, list("makeaisilent"=href_list["makeaisilent"])) else if (href_list["adjustDamage"] && href_list["mobToDamage"]) var/mob/M = locate(href_list["mobToDamage"]) var/Text = locate(href_list["adjustDamage"]) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index e737c29cb4e..d39d9d14014 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1015,10 +1015,6 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove icon_state = "pen_red" text_color = "#FF0000" -/obj/item/weapon/pen/multi - desc = "It's a cool looking pen. Lots of colors!" - name = "multicolor pen" - /obj/item/weapon/pen/feather name = "feathery pen" desc = "A gold pen disguised as a quill. How quaint." diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index 25a66eaac20..6a94e65dd1c 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -8,6 +8,12 @@ var/checkwin_counter =0 var/finished = 0 + var/cruiser_arrival + + var/virus_name = "" + + var/stage = 0 + /////////////////////////// //Announces the game type// /////////////////////////// @@ -31,6 +37,51 @@ return 1 +/datum/game_mode/epidemic/proc/cruiser_seconds() + return (cruiser_arrival - world.time) / 10 + +////////////////////// INTERCEPT //////////////////////// +/// OVERWRITE THE INTERCEPT WITH A QUARANTINE WARNING /// +///////////////////////////////////////////////////////// + +/datum/game_mode/epidemic/send_intercept() + var/intercepttext = "CONFIDENTIAL REPORT
|
- Baystation 12
-
Read the player guidelines!- -Github change history- -/tg/station13 Development Team:-Coders: TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor-Spriters: Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor -Sounds: Skie, Lasty +/tg/ station 13 Development Team +
- GoonStation 13 Development Team- Coders: Stuntwaffle, Showtime, Pantaloons, Nannek, Keelin, Exadv1, hobnob, Justicefries, 0staf, sniperchance, AngriestIBM, BrianOBlivion- Spriters: Supernorn, Haruhi, Stuntwaffle, Pantaloons, Rho, SynthOrange, I Said No - - -
+ Coders: Stuntwaffle, Showtime, Pantaloons, Nannek, Keelin, Exadv1, hobnob, Justicefries, 0staf, sniperchance, AngriestIBM, BrianOBlivion
++ Spriters: Supernorn, Haruhi, Stuntwaffle, Pantaloons, Rho, SynthOrange, I Said No + ![]() This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License. Rights are currently extended to SomethingAwful Goons only. + Some icons by Yusuke Kamiyamane. All rights reserved. Licensed under a Creative Commons Attribution 3.0 License. + |