9c21cf5d42
fixes and such
2015-01-27 17:16:42 -08:00
e507cd31d8
Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit
2015-01-27 17:12:59 -08:00
5da386c2ad
New Silicon Emotes!
...
Adds the following emotes, all audible:
- buzz2
- chime (MULEbot delivery chime)
- honk, with the pitch variation of the standard bike horn!
- sad, the sad trombone sound from HONK mechs!
- warn, the warning buzzer from newscasters and disposal shutes
I also set the other audible emotes to audio message type.
2015-01-27 12:51:18 -06:00
58648d267e
Merge pull request #7271 from Incoming5643/Maybe_it_ran_out_of_gas
...
Shuttle Stranding
2015-01-27 17:55:26 +01:00
6b17d4e8f8
UpdatedCoolingModule
2015-01-27 23:45:49 +08:00
757a3aa810
Removes duplicate fluorine
...
from dispensable_reagents
2015-01-27 16:00:53 +01:00
4262a1c89c
WrongDescription
2015-01-27 20:37:00 +08:00
f279e0754b
MisplacedLine
2015-01-27 17:47:25 +08:00
8b78853c68
Tweaking
2015-01-27 17:43:13 +08:00
359514e239
SecBorgDisabler
2015-01-27 17:24:13 +08:00
a59b265429
adjusts synthflesh more
2015-01-26 18:14:32 -08:00
454879d554
nerfs synthflesh
2015-01-26 16:18:30 -08:00
ea31570549
buffs styptic and silver sulf
2015-01-26 16:17:26 -08:00
b830f77ea2
Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-01-26 15:37:33 -08:00
b28d1773a3
Fixes firing pins replicating original lockbox anti-melee functionality.
2015-01-26 16:23:25 -06:00
7b8e2cd0c6
Merge pull request #7109 from Xhuis/whydidthisnotexistanywayfuckingchrist
...
Gives Syndicate cyborgs an operative pinpointer module
2015-01-26 20:18:41 +01:00
8023756ef8
Merge pull request #7342 from Ikarrus/falsealarm
...
False Alarm Event Tweaks
2015-01-26 20:16:49 +01:00
d73b83f70f
Merge pull request #7352 from Deantwo/BrBreaks
...
View Own Notes Readabily Fix
2015-01-26 20:16:13 +01:00
6e38213872
fixes styptic powder and silver sulf not healing properly
2015-01-26 11:14:35 -08:00
e159cf0498
Fixes typo in the message the AI gets when attempting to print a picture when it has none.
2015-01-26 20:06:07 +01:00
be26c22e74
Merge pull request #7320 from GunHog/IFixedItForSCIENCE
...
Fixes the E.X.P.E.R.I-MENTOR and related reagent runtime
2015-01-26 19:30:29 +01:00
0a3ffd8f19
Complete fix for reagent runtimes
...
The proc was simply used incorrectly. Replaces "=" with ","
2015-01-26 12:25:20 -06:00
1534c82240
* Build the area list at world startup
...
* Fix the station areas not being processed in the jump_to_area proc
2015-01-26 19:09:05 +01:00
f1be4d510c
removed slime naming and 3am comment
2015-01-26 03:08:18 -07:00
1c59e972ce
adds iv drip and blood packs to the map
2015-01-26 00:21:11 -08:00
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
d9f49a4eb5
colon and locate() for blood
2015-01-25 16:53:12 -08:00
ee64679e8b
fixes helmet lights
2015-01-25 16:35:21 -08:00
f7730eeaef
Merge pull request #7087 from paprka/readdjanikart
...
Improves janicart and adds secway
2015-01-26 00:31:30 +00:00
7b97431a0b
Fixes an edge case with continuous round malf where the round could become unresovable
...
Fixes a spolling errar
2015-01-25 17:49:04 -05:00
8d3e3cf98b
added slime naming verb, dragdrop feeding, and stealing mass from other slimes
2015-01-25 15:16:24 -07:00
8a40130d1d
removes an unnecessary override
2015-01-25 13:16:46 -08:00
ac63bf3d6b
Replaces pinpointer with operative pinpointer
2015-01-25 12:44:19 -05:00
39a9283592
Merge pull request #7329 from Deantwo/PencodeAftermath
...
Pencode aftermath changes
2015-01-25 18:40:35 +01:00
1bccc65bc1
Merge pull request #7331 from Iamgoofball/patch-14
...
Makes say mods from genetic disabilties get handled after stuttering
2015-01-25 18:40:24 +01:00
ba5c28d6f8
Merge pull request #7323 from Cheridan/weaken_cleanup
...
Fixes Weaken() for Ergo
2015-01-25 15:22:39 +01:00
6bed1a71ce
View Own Notes Readabily Fix
...
Adds a line brreak ("<br>") after each note.
2015-01-25 10:46:27 +01:00
3365d1c40a
toggles commit
2015-01-25 01:41:39 -08:00
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
8c893f6aca
Merge pull request #7065 from phil235/GibtoniteLogFix
...
Gibtonite log fix
2015-01-25 00:29:18 -06:00
637e005646
Merge pull request #7322 from Jordie0608/notlikeanyoneusesthemanyway
...
Fixes default medipens being empty
2015-01-24 23:56:52 -06:00
120402e36f
added blood packs and iv drips to cargo
2015-01-24 21:27:24 -08:00
2414d79a83
False Alarm Event Tweaks
...
- Weighting increased to 20
- No longer picks from wizard events
2015-01-24 20:14:06 -07:00
25c23db4c8
nanomachines, son
2015-01-24 18:52:33 -08:00
8a28571d83
fixes more runtimes
2015-01-24 18:31:59 -08:00
f7a32789fb
Merge pull request #7306 from hornygranny/wzhzhzh
...
Renames ridiculous proc
2015-01-25 04:21:00 +03:00
d073c7f624
Merge pull request #7307 from Menshin/donuts_startup_runtimes_fix
...
Fixes runtimes related to donuts on startup
2015-01-24 16:55:43 -06:00
cc2238e5a8
Missed one
2015-01-24 23:46:05 +01:00
c33992fed0
Code cleanup
2015-01-25 00:04:50 +04:00
d7a942901f
Merge pull request #7159 from Jordie0608/whatdothenumbersmean
...
Prevents permabans from noting as 0 minute bans
2015-01-24 15:18:56 -03:00
paprka
GunHog
Swag McYolosteinen
Steelpoint
Deantwo
Iamgoofball
Cheridan
phil235
Menshin
Delimusca
Remie Richards
Incoming
Xhuis
Ikarrus
Razharas
Lo6a4evskiy
tkdrg