diff --git a/code/WorkInProgress/plants/plant.dm b/code/WorkInProgress/plants/plant.dm deleted file mode 100644 index 46b9a4f513..0000000000 --- a/code/WorkInProgress/plants/plant.dm +++ /dev/null @@ -1,18 +0,0 @@ -/* -/obj/plant - name = "plant" - icon = 'plants.dmi' - flags = FPRINT | TABLEPASS - var/health = 100 - var/bruteloss = 0 - var/toxloss = 0 - var/generation = 1 - var/life_stage = 0 - var/datum/disease/virus = null - -/obj/item/seedpacket - name = "seed packet" - icon = 'plants.dmi' - icon_state = "packet" - flags = FPRINT | TABLEPASS -*/ \ No newline at end of file diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 0a899e50fc..9ac0c77430 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -18,6 +18,7 @@ icon = 'hydroponics.dmi' icon_state = "seed" // unknown plant seed - these shouldn't exist in-game flags = FPRINT | TABLEPASS + w_class = 1.0 // Makes them pocketable var/mypath = "/obj/item/seeds" var/plantname = "" var/productname = "" @@ -637,4 +638,49 @@ obj/item/weapon/grown/attackby(var/obj/item/O as obj, var/mob/user as mob) icon_state = "bottle15" flags = FPRINT | TABLEPASS toxicity = 8 - WeedKillStr = 7 \ No newline at end of file + WeedKillStr = 7 + + + + + + + +// ************************************* +// Nutrient defines for hydroponics +// ************************************* + + + +/obj/item/nutrient + name = "" + icon = 'chemical.dmi' + icon_state = "bottle16" + flags = FPRINT | TABLEPASS + w_class = 1.0 + var/mutmod = 0 + var/yieldmod = 0 + +/obj/item/nutrient/ez + name = "E-Z-Nutrient" + icon = 'chemical.dmi' + icon_state = "bottle16" + flags = FPRINT | TABLEPASS + mutmod = 1 + yieldmod = 1 + +/obj/item/nutrient/l4z + name = "Left 4 Zed" + icon = 'chemical.dmi' + icon_state = "bottle18" + flags = FPRINT | TABLEPASS + mutmod = 2 + yieldmod = 0 + +/obj/item/nutrient/rh + name = "Robust Harvest" + icon = 'chemical.dmi' + icon_state = "bottle15" + flags = FPRINT | TABLEPASS + mutmod = 0 + yieldmod = 2 \ No newline at end of file diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index 1a3fbeff28..25e35e032d 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -617,18 +617,18 @@ icon_state = "nutri" icon_deny = "nutri-deny" product_paths = "/obj/item/nutrient/ez;/obj/item/nutrient/l4z;/obj/item/nutrient/rh" - product_amounts = "25;15;15" + product_amounts = "35;25;15" product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!" /obj/machinery/vending/hydroseeds name = "MegaSeed Servitor" desc = "When you need seeds fast!" icon_state = "seeds" - product_paths = "/obj/item/seeds/chiliseed;/obj/item/seeds/berryseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/wheatseed;/obj/item/seeds/soyaseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/nettleseed" - product_amounts = "2;2;2;2;2;2;2;2;1" + product_paths = "/obj/item/seeds/chiliseed;/obj/item/seeds/berryseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/wheatseed;/obj/item/seeds/soyaseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium" + product_amounts = "2;2;2;2;2;2;2;2" product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!" - product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium;/obj/item/seeds/towermycelium" - product_hideamt = "1;2;2;2;2" + product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium" + product_hideamt = "1;2;2;2" /obj/machinery/microwave name = "Microwave" diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 0b89977fef..b98e9354e9 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -91,7 +91,7 @@ var/global/datum/controller/gameticker/ticker //Start master_controller.process() world << "Enjoy the game!" - spawn(50) + spawn(-1) world << sound('welcome.ogg') // Skie diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index afe2ee821f..a085acf8cc 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -216,6 +216,7 @@ comm.messagetext.Add(intercepttext) command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.") + world << sound('intercept.ogg') /datum/game_mode/nuclear/proc/random_radio_frequency() var/f = 0 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 3b81400e5d..8da21d4b61 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -153,6 +153,7 @@ comm.messagetext.Add(intercepttext) command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.") + world << sound('intercept.ogg') /datum/game_mode/revolution/check_win() diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index a0d3f54a62..283aea3532 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -172,6 +172,7 @@ comm.messagetext.Add(intercepttext) command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.") + world << sound('intercept.ogg') /datum/game_mode/traitor/declare_completion() diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 51ec4250fc..c9e4f6508a 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -255,6 +255,7 @@ comm.messagetext.Add(intercepttext) command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.") + world << sound('intercept.ogg') /datum/game_mode/wizard/declare_completion() if(finished) diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 7354a4f951..bb6196d17d 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -50,7 +50,7 @@ Deathnettle playsound(src.loc, 'spray3.ogg', 50, 1, -6) spawn(0) - for(var/i=0, i<2, i++) // Max range = 2 tiles + for(var/i=0, i<3, i++) // Max range = 3 tiles step_towards(D,A) // Moves towards target as normally (not thru walls) D.reagents.reaction(get_turf(D)) for(var/atom/T in get_turf(D)) diff --git a/code/game/sound.dm b/code/game/sound.dm index 037d5cdc16..6856fc3427 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -53,7 +53,7 @@ client/verb/Toggle_Soundscape() if(usr:client:no_ambi) usr << sound('shipambience.ogg', repeat = 0, wait = 0, volume = 0, channel = 2) else - usr << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 50, channel = 2) + usr << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) usr << "Toggled ambience sound." return @@ -70,14 +70,14 @@ client/verb/Toggle_Soundscape() if (A && A:client && !A:client:ambience_playing && !A:client:no_ambi) // Constant background noises A:client:ambience_playing = 1 - A << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 50, channel = 2) + A << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) switch(src.name) if ("Chapel") sound = pick('ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg') if ("Morgue") sound = pick('ambimo1.ogg','ambimo2.ogg') if ("Engine Control") sound = pick('ambieng1.ogg') if ("Atmospherics") sound = pick('ambiatm1.ogg') - else sound = pick('ambigen1.ogg','ambigen2.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen13.ogg','ambigen14.ogg') + else sound = pick('ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg') if (prob(35)) if(A && A:client && !A:client:played) diff --git a/code/game/verbs/authorize.dm b/code/game/verbs/authorize.dm index df708c3042..3386fe987b 100644 --- a/code/game/verbs/authorize.dm +++ b/code/game/verbs/authorize.dm @@ -101,7 +101,7 @@ if (!success) src.verbs += /client/proc/goonauth - src << "Failed" + //src << "Failed" src << "\blue[no_auth_motd]" src.authenticating = 0 diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 1dfaf82f49..5dad9ff109 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -220,6 +220,8 @@ M.add_supplied_law(10,"[area] [area2] [amount] of [who]") command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert") + world << sound('ionstorm.ogg') + /client/proc/cmd_admin_add_freeform_ai_law() set category = "Debug" @@ -305,6 +307,7 @@ command_alert(input); + world << sound('commandreport.ogg') log_admin("[key_name(src)] has created a command report: [input]") message_admins("[key_name_admin(src)] has created a command report", 1) diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 44ae3f9bf9..33ab838b23 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -19,12 +19,19 @@ if(M.job == "Chaplain") if (prob (49)) M.show_message("You hear muffled speech... but nothing is there...", 2) + if(prob(20)) + playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1) else M.show_message("[stutter(message)]", 2) + if(prob(30)) + playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1) else if (prob(50)) return else if (prob (95)) M.show_message("You hear muffled speech... but nothing is there...", 2) + if(prob(20)) + playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1) else - M.show_message("[stutter(message)]", 2) \ No newline at end of file + M.show_message("[stutter(message)]", 2) + playsound(src.loc, pick('ghost.ogg','ghost2.ogg'), 10, 1) \ No newline at end of file diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d333b86511..77b172ce14 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1746,8 +1746,8 @@ src << "
[join_motd]
" src.authorize() - src.goonauth() - src.beta_tester_auth() + //src.goonauth() -- Skie, commented out because not goons anymore. + ///src.beta_tester_auth() src.update_world() diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index ecdbb2728a..4d542413bd 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -136,7 +136,10 @@ O.name = newname world << text("[O.real_name] is the AI!") - world << sound('newAI.ogg') + + spawn(50) + world << sound('newAI.ogg') + if (ticker.mode.name == "AI malfunction") for (var/obj/landmark/start/A in world) if (A.name == "AI") diff --git a/code/game/airtunnel.dm b/code/unused/airtunnel.dm similarity index 100% rename from code/game/airtunnel.dm rename to code/unused/airtunnel.dm diff --git a/goonstation.dme b/goonstation.dme index a6c90e6bfa..9e5ec1768e 100644 --- a/goonstation.dme +++ b/goonstation.dme @@ -209,7 +209,6 @@ #include "code\defines\obj\hydro.dm" #include "code\defines\obj\injector.dm" #include "code\defines\obj\machinery.dm" -#include "code\defines\obj\nutrient.dm" #include "code\defines\obj\radio.dm" #include "code\defines\obj\spawner.dm" #include "code\defines\obj\storage.dm" diff --git a/icons/changelog.html b/icons/changelog.html index 3799673162..4cdd05440a 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -25,24 +25,31 @@ -

We have a forum! http://tgstation13.servehttp.com

-

Google Code project page: http://tgstation13.googlecode.com/

+

We have a forum! http://tgstation13.servehttp.com

+

Google Code project page: http://tgstation13.googlecode.com/

-Goon Station 13 -
Goon Station 13 Creative Commons License
-
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 -

+/tg/Station 13

Submit bug reports to TLE, the issue tracker on our Google Code project page, or in the IRC channel

Visit our IRC channel, #tgstation13 on irc.rizon.net

-

Changelog

+
/tg/Station 13 Development Team
+ Coders: TLE, NEO, muskets, veryinky, Skie, Numbers
+ Spriters: Skie, Agouri
+ Sounds: Skie
+ Thanks to: Ursarkar E. Creed, CDK Station devs, GoonStation devs and original SpaceStation developers -

Monday, September 12, 12.48

+

Changelog

+
Monday, September 13, 13:30
+ + +
Monday, September 12, 12:48
-

Thursday, September 2, 22:45

+
Thursday, September 2, 22:45
-

Monday, August 30, 16:24

+
Monday, August 30, 16:24
-

Sunday, August 29, 05:09

+
Sunday, August 29, 05:09
-

Thursday, August 26, 21:07

+
Thursday, August 26, 21:07
-

Friday, August 06, 20:32

+
Friday, August 06, 20:32
-

Tuesday, July 13, 22:35

+
Tuesday, July 13, 22:35
-

Saturday, July 10, 15:10

+
Saturday, July 10, 15:10
-

Friday, July 09, 05:16

+
Friday, July 09, 05:16
-

Tuesday, July 06, 19:16

+
Tuesday, July 06, 19:16
-

Sunday, April 25, 18:53

- -

Saturday, June 27th, 2009

+
Saturday, June 27th, 2009
-

Saturday, June 27th, 2009

+
Saturday, June 27th, 2009
-

Friday, June 12th, 2009

+
Friday, June 12th, 2009
-

Wednesday, June 3rd, 2009

+
Wednesday, June 3rd, 2009
-

Monday, June 1st, 2009

+
Monday, June 1st, 2009
-

Wednesday, May 6th, 2009

+
Wednesday, May 6th, 2009
-

Monday, May 4th, 2009

+
Monday, May 4th, 2009
-

Saturday, April 18th, 2009

+
Saturday, April 18th, 2009
-

Fri, April 10, 2009

+
Fri, April 10, 2009
-

Wed&Thu, April 8&9, 2009

+
Wed&Thu, April 8&9, 2009
-

Mon&Tue, April 6&7, 2009

+
Mon&Tue, April 6&7, 2009
-

Sunday, April 5, 2009

+
Sunday, April 5, 2009
-

Saturday, April 4, 2009

+
Saturday, April 4, 2009
-

Wednesday, April 1, 2009

+
Wednesday, April 1, 2009
-

Friday, March 27, 2009

+
Friday, March 27, 2009
-

Thursday, March 26, 2009

+
Thursday, March 26, 2009
-

Tuesday, March 24, 2009

+
Tuesday, March 24, 2009
-

Monday, March 23, 2009 (EXPERIMENTAL)

+
Monday, March 23, 2009 (EXPERIMENTAL)
-

Monday, March 23, 2009

+
Monday, March 23, 2009
-

Saturday, March 21, 2009

+
Saturday, March 21, 2009
-

Thursday, March 19, 2009

+
Thursday, March 19, 2009
-

Tuesday, March 17, 2009

+
Tuesday, March 17, 2009
-

Saturday, March 14, 2009

+
Saturday, March 14, 2009
-

Saturday, March 7, 2009

+
Saturday, March 7, 2009
-

Tuesday, February 24, 2009

+
Tuesday, February 24, 2009
-

Saturday, February 22, 2009

+
Saturday, February 22, 2009
-

Thursday, February 19, 2009

+
Thursday, February 19, 2009
-

Monday, February 17, 2009

+
Monday, February 17, 2009
-

Friday, February 13, 2009

+
Friday, February 13, 2009
-

Tuesday, February 10, 2009

+
Tuesday, February 10, 2009
-

Sunday, February 8, 2009

+
Sunday, February 8, 2009
-

Friday, February 6, 2009

+
Friday, February 6, 2009
-

Thursday, February 5, 2009

+
Thursday, February 5, 2009
-

Tuesday, February 3, 2009

+
Tuesday, February 3, 2009
-

Monday, February 2, 2009

+
Monday, February 2, 2009
-

Saturday, January 31, 2009

+
Saturday, January 31, 2009
-

Thursday, January 29, 2009

+
Thursday, January 29, 2009
-

Saturday, January 10, 2009

+
Saturday, January 10, 2009
-

Wednesday, January 7, 2009

+
Wednesday, January 7, 2009
-

Monday, January 5, 2009

+
Monday, January 5, 2009
+
+
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
+
+

Creative Commons License
Except where otherwise noted, Goon Station 13 is licensed under a Creative Commons Attribution-Noncommercial-Share Alike 3.0 License.
Rights are currently extended to SomethingAwful Goons only.

\ No newline at end of file diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index c6e6d272cd..9ec2120cf3 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/sound/announcer/commandreport.ogg b/sound/announcer/commandreport.ogg new file mode 100644 index 0000000000..0979e57546 Binary files /dev/null and b/sound/announcer/commandreport.ogg differ diff --git a/sound/announcer/intercept.ogg b/sound/announcer/intercept.ogg new file mode 100644 index 0000000000..ede4cb1c19 Binary files /dev/null and b/sound/announcer/intercept.ogg differ diff --git a/sound/announcer/ionstorm.ogg b/sound/announcer/ionstorm.ogg new file mode 100644 index 0000000000..fc8d11ca82 Binary files /dev/null and b/sound/announcer/ionstorm.ogg differ diff --git a/sound/announcer/outbreak5.ogg b/sound/announcer/outbreak5.ogg index ef240d4d0c..78406fbc87 100644 Binary files a/sound/announcer/outbreak5.ogg and b/sound/announcer/outbreak5.ogg differ