diff --git a/code/game/sound.dm b/code/game/sound.dm index 20fc5538312..e96e2f00332 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -82,12 +82,12 @@ client/verb/Toggle_Soundscape() 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') Commenting out in favor of a new, more applicable sound./N + if ("Space") sound = pick('ambispace.ogg') if ("Engine Control") sound = pick('ambisin1.ogg','ambisin2.ogg','ambisin3.ogg','ambisin4.ogg') if ("Atmospherics") sound = pick('ambiatm1.ogg') if ("Mine") - sound = pick('null.ogg','null.ogg') - musVolume = 60 + sound = pick('ambimine.ogg') + musVolume = 25 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)) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 46c3ae1aa34..bd3f4434023 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -177,8 +177,10 @@ var/list/karma_spenders = list() usr << "\red You can't spend karma on yourself!" return var/choice = input("Give [M.name] good karma or bad karma?", "Karma") in list("Good", "Bad", "Cancel") + client.karma_spent = 1 if(!choice || choice == "Cancel") return + client.karma_spent = 0 if(choice == "Good") M.client.karma += 1 if(choice == "Bad") diff --git a/icons/changelog.html b/icons/changelog.html index ee9c823d3c4..294aa939be7 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -41,7 +41,7 @@ Credits:
Coders: TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben
 Spriters: Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat
 - Sounds: Skie
 + Sounds: Skie, Lasty
 Thanks to: CDK Station devs, GoonStation devs, the original SpaceStation developers and Erikat for the title image @@ -54,7 +54,7 @@ Stuff which is in development and not yet visible to players or just code relate (is. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit tho. Thanks. --> -6 September 2011, normal day of riots in Greece. +6 September 2011
  • Agouri updated:
      @@ -62,7 +62,41 @@ should be listed in the changelog upon commit tho. Thanks. -->
    • More info here: rev2136
+
    +
  • Lasty updated: +
      +
    • Fixed the karma exploit! Uhangi can rest in peace knowing his -87 karma ways were not his own.
      • +
    • Added new ambient sound for space and the mines.
      • +
    • Oxygen tanks will now beep to warn you when you are about to run out of air.
      • +
    +
+
    +
  • Erro updated: +
      +
    • Sleeper update! Sleepers can now only inject soporific, dermaline, bicaridine, and dexaline into people with 1% or more health. They can also inject inaprovaline into people with -100% or more health. Nothing can be injected into people who are dead.
      • +
    +
+
    +
  • Superxpdude updated: +
      +
    • Virology is now part of medbay, and as such the RD no longer has Virology access and the CMO and Virologist no longer have Research access.
      • +
    +
+
    +
  • Uhangi updated: +
      +
    • Electropacks, screwdrivers, headsets, radio signalers, and station bounced radios can now be constructed from the autolathe.
      • +
    • Added a courtroom to Centcom.
      • +
    • Fixed electropack bug regarding using screwdrivers on electropacks.
      • +
    +
+
    +
  • Urist McDorf updated: + +
5 September 2011.
  • Rageroro updated: @@ -100,6 +134,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Added Necronomicon bible (credit Joseph Curwen)
  • Removed Doc Scratch clothing from chaplain’s locker and added as a random spawn in the theatre.
  • Shaft Miners now start with regular oxygen tanks.
    • +
  • Mutate now gives the wizard hulk and OPTIC BLAST instead of hulk and TK.
  • Spiderman suit is no longer armoured or space worthy.
  • Crayons
diff --git a/sound/ambience/ambimine.ogg b/sound/ambience/ambimine.ogg new file mode 100644 index 00000000000..b4c6c96ac9c Binary files /dev/null and b/sound/ambience/ambimine.ogg differ diff --git a/sound/ambience/ambispace.ogg b/sound/ambience/ambispace.ogg new file mode 100644 index 00000000000..37f577f8db5 Binary files /dev/null and b/sound/ambience/ambispace.ogg differ