Commit Graph

6854 Commits

Author SHA1 Message Date
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
Chinsky
629022f7b0 Fixes #2836
Winners do not use space drugs.
Fixes LSD giving you an ability to escape death once.
Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death().
My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200.
2013-05-23 15:06:37 +04:00
Chinsky
8b60bab4a7 Merge pull request #2835 from Roaper/master
No tears, only dreams
2013-05-23 01:55:45 -07:00
Roaper
cb59473d02 Added more dreams to Dreaming.dm
Signed-off-by: Roaper <roaperable@gmail.com>
2013-05-22 13:36:27 -07:00
Chinsky
317cbd8438 Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	baystation12.dme
2013-05-22 16:51:41 +04:00
Chinsky
1ca42d0c88 Fixed some sharp stuff not being recognized as such.
That lead to knives bruising people you stab, for example.
2013-05-22 12:55:15 +04:00
Chinsky
8b01f8bcc3 Finished up tentacle abominations.
Clone damage will cause body parts to mutate.
The more damage you have, the more chance to get a sweet tentacle.
Healing works other way, the less damage you have, the more chance to unmutate it.
Healing all the damage fixes everything.
2013-05-21 05:40:00 +04:00
Chinsky
99fcf1b3be Merge pull request #2819 from Roaper/master
Readded Pockets in the Responder Jackets
2013-05-20 14:34:15 -07:00
Roaper
99ff1f7ee0 Added Pockets to First Responder Jacket
Signed-off-by: Roaper <roaperable@gmail.com>
2013-05-20 13:33:44 -07:00
Chinsky
7806915619 Added organ mutations.
Only have sprites for humans yet.
Added is_usable() proc that checks for both limb missing or being a tentacle
2013-05-19 17:56:29 +04:00
Chinsky
e032e3101d Merge pull request #2811 from caelaislinn/xenoarch
Xenoarch tweaks
2013-05-19 04:24:15 -07:00
Cael_Aislinn
1784bcbb04 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into rust 2013-05-19 19:41:18 +10:00
Cael_Aislinn
454d67d899 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into rust 2013-05-19 19:34:10 +10:00
Cael_Aislinn
7067382f52 hardcapped xenoarch machinery heat to 177K, made xenoarch machinery only produce heat when scanning, added a couple of missing tools to the gearbelt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-19 19:12:42 +10:00
Cael_Aislinn
1d9fe082d7 made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-19 18:50:15 +10:00
cib
f5b0b52b6c Added stasis bag.
This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.
2013-05-19 07:48:43 +02:00