MagmaRam
db07fd16fd
Fixes an issue where an uzi could not be reloaded, they can now be reloaded with boxes of .45 bullets.
2013-05-30 18:54:31 +07:00
jupotter
73a9958f29
Do not change both key and ckey
...
Changing both the key and the ckey causes issues #2856 and #2803
2013-05-30 13:51:40 +02:00
Andrew Carroll
97836acb56
Add station time to AI, new_player Status tab
2013-05-30 04:38:18 -04:00
Chinsky
1f2e3b068e
Merge pull request #2899 from Roaper/master
...
Yeah. Here.
2013-05-29 21:01:19 -07:00
Mloc
4eb113341d
Merge pull request #2871 from ciiol/bs-rtag
...
Fix radio keys localization.
2013-05-29 14:26:03 -07:00
Roaper
ec8a39b45e
Added more useless fluff
2013-05-29 14:12:12 -07:00
Erthilo
3312490691
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
2013-05-29 11:22:40 +01:00
MagmaRam
e4c913fad9
Fix for issue #2882 in Baystation12/master (CR-20 not updating sprite correctly when unloaded by in-hand click).
2013-05-29 13:34:54 +07:00
Chinsky
40e63cbe32
Merge pull request #2885 from Ravensdale/master
...
Cyborg sprites
2013-05-28 22:17:13 -07:00
VitrescentTortoise
d7fb1f81ca
Fixed xenoarchaeology picksets not being able to hold everything they start with.
2013-05-28 19:58:42 -07:00
Erthilo
01ef589293
Fixes everyone being able to understand everyone else.
2013-05-28 23:53:49 +01:00
Ravensdale
62e43f2abf
re-adding an accidentally deleted line
2013-05-28 12:07:22 -07:00
Jim "Apples"
b80ae68cc5
Merge pull request #2883 from CIB/master
...
Re-buff even timer
2013-05-28 11:49:25 -07:00
Ravensdale
b42aa26c1a
Gives more sprites for cyborgs to use.
2013-05-28 11:13:33 -07:00
cib
a9d4d86ed9
Event balance fixes.
...
- Engineering events now less likely
- Radiation storm now less likely
- Halved radiation given by radiation storm.
2013-05-28 20:03:26 +02:00
Chinsky
9ab9631ae6
Since organ processing interval is so big, sets bleeding manually so hemostat step would work.
2013-05-28 18:27:40 +04:00
Chinsky
c84ce517e3
Changed way substitute tools are handled.
...
Now all tools have chance of success. Proper ones have 100.
If tool has less than 100 chance of success, it can fail the step.
2013-05-28 18:16:11 +04:00
Chinsky
d2179f4252
Merge pull request #2875 from CIB/medical_events
...
Fixed issue #2689
2013-05-27 12:04:19 -07:00
cib
c5dc8ebecf
Triped time you have to get into maintenance.
...
Also re-added sound at start of event. It doesn't fit, but it's better than nothing. Quit complaining already.
2013-05-27 20:01:37 +02:00
Ciiol
e7127b8343
Fix radio keys localization.
...
Add cyrillic analogs of xeno language keys, just as other channel prefixes.
2013-05-27 16:34:39 +06:00
VitrescentTortoise
83b5dea0a4
Merge with BEF
2013-05-26 19:23:27 -07:00
VitrescentTortoise
aa68ac375a
Edited changelog, made small edit.
2013-05-26 19:00:55 -07:00
VitrescentTortoise
d0d51222e1
Allows players to return to lobby if job prefernces unavailable
2013-05-26 18:18:41 -07:00
Mloc
5f580c8417
Merge pull request #2855 from VitrescentTortoise/bleeding-edge-freeze
...
Resizes lobby manifest window & Cult chant edit
2013-05-26 14:57:33 -07:00
Mloc
b4743bef26
Merge pull request #2865 from CIB/medical_events
...
Fixed various medical events.
2013-05-26 14:56:53 -07:00
cib
cbbe291a5d
Fixed various medical events.
2013-05-26 23:21:08 +02:00
cib
dbe960a571
Buffed event delay a bit again.
2013-05-26 22:16:11 +02:00
Mloc
3d21ec7f5a
Merge pull request #2834 from comma/tentacles
...
Tentacles
2013-05-26 11:49:38 -07:00
cib
cab1289511
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
html/changelog.html
2013-05-26 20:43:22 +02:00
Mloc
420354d1dc
Merge pull request #2860 from CIB/master
...
Fix to event no-repetition code
2013-05-26 11:40:42 -07:00
VitrescentTortoise
c842f21bc5
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-05-26 00:45:47 -07:00
Chinsky
f9b0ba7a49
Added lids for bottles and beakers.
...
Click on vessel in hand to put lid on / take it off.
Lids prevent use of syringes and spilling.
2013-05-26 06:38:38 +04:00
Chinsky
c78f47c795
Merge branch 'bleeding-edge-freeze' into tentacles
2013-05-26 05:02:34 +04:00
Chinsky
13e2d8d793
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-05-26 05:02:07 +04:00
VitrescentTortoise
6f6731dab0
Resizes lobby manifest window
2013-05-25 16:53:07 -07:00
Chinsky
76525a4ccf
Merge pull request #2852 from VitrescentTortoise/bleeding-edge-freeze
...
Changeling husk names now 'Unknown'
2013-05-25 16:03:24 -07:00
VitrescentTortoise
827e85c4c3
Properly sets husks' names to unknown
2013-05-25 16:00:22 -07:00
cib
9074622eb9
Adjusted event chance modifier based on last event.
...
Had the wrong numbers, basically every event would happen only once.
2013-05-26 00:23:31 +02:00
cib
a764c226f8
Implemented a system to avoid the same event happening too often.
...
Also bumped event frequency, this shouldn't be as bad with the same event not repeating itself that often.
2013-05-26 00:12:59 +02:00
Erthilo
e2ea94d59c
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-05-25 22:16:29 +01:00
Erthilo
4028172c98
Fixes mutantrace languages appearing as unknown for observers and also appearing as says rather than race specific word.
2013-05-25 22:09:41 +01:00
Erthilo
c2b84e0985
Fixes mutantraces (soghun, skrell, tajaran) losing languages when cloned.
2013-05-25 22:08:57 +01:00
VitrescentTortoise
afb49c05d9
Fixed lemonjuice showing up as ..what?
2013-05-25 12:52:56 -07:00
Chinsky
e197799c46
Fixes #2830
...
Applied Walter0o's fix to silicon namepicking locking up job spawn on roundstart.
2013-05-25 13:34:24 +04:00
Jim "Apples"
858d98eb7c
Merge pull request #2816 from comma/HTML
...
HTML in papers
2013-05-24 14:30:36 -07:00
Chinsky
30d93bd7d2
Fixed indentation derp.
...
I guess it was a dream when I saw it compiling.
2013-05-24 01:02:52 +04:00
cib
89aa936147
Fix to organ_failure event.
2013-05-23 22:46:27 +02:00
Chinsky
665aaea722
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into tentacles
2013-05-24 00:43:33 +04:00
cib
b1b448e0ee
Adjusted event announcement delays.
...
Also improved some radiation belt announcements.
2013-05-23 20:15:45 +02:00
cib
aa6bfc33c7
Airlock and APC changes.
...
- Added a debugger device that can figure out when an object has been hacked/emagged
- Hacked APCs no longer display blue screen
- You can now disassemble emagged airlocks, they will yield a fried airlock electronic.
2013-05-23 16:43:29 +02:00