Commit Graph

10089 Commits

Author SHA1 Message Date
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
d45073a5ab Added new item - hailer. Use in hand to make it say HALT! SECURITY!
Should help in asking people to halt while running.
2013-05-28 03:12:58 +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
Furlucis
08524aa4d2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-27 01:48:44 -04: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
Chinsky
b46924556b Merge pull request #2861 from fauxki/bleeding-edge-freeze
Wall Recharger Fix - bef
2013-05-26 11:21:26 -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
b13424322a Chants changed to things less silly. 2013-05-25 17:51:12 -07: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
VitrescentTortoise
c451287aa8 The name of changeling husks is now unknown 2013-05-25 14:17:16 -07:00
Erthilo
e2ea94d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-25 22:16:29 +01:00
Erthilo
0e3bf2f371 Fixes UI being reset randomly on irradiating in Genetic Scanners. 2013-05-25 22:10:14 +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
fauxtada
f6f263ebcd Wall Recharger Fix
- Oopsie. Sprites should work now when recharger is charging.
2013-05-25 09:32:25 -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
Chinsky
b78cb81a38 Fixes #2849
Applied Walter0o's fix to job controller changing whole job's access when single ID was modified.
2013-05-25 13:18:12 +04:00
Jim "Apples"
858d98eb7c Merge pull request #2816 from comma/HTML
HTML in papers
2013-05-24 14:30:36 -07:00
Asanadas
e0f4b0d1ed Bugfix: Prevents airlock_controller.dm and similar from being destroyed by mech drills or acid. Prevents headaches. 2013-05-24 14:55:28 -04:00
meyar
1ac5ac6ec5 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-24 07:55:24 -04:00
meyar
1d5d7cb901 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-24 06:52:03 -04:00
meyar
c1e701f32b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
2013-05-24 05:23:36 -04:00
fauxtada
cb5b83fadb Wall Charger Addition / Map Edits
- Puts in wall recharger sprite. For all your wall recharging needs.
- Reverts changes someone did moving my wall temp placement wall rechargers..
- Fixes airlocks over doors issue in sec.
- Also removed the access medical from the medical area of security. It's just a quick area to treat cuts and bruises, and shouldn't have items that treat more then that.
- Fixed some more weirdly placed rechargers around the station.
- Replaced the TG Maltese Falcon sign with the BS12 one.
- Fixed up the floor in the pool area.
- Added some lights and decorative items to that weird tator / table area south of the security pod. As well as a water tank and fuel tank.
2013-05-23 17:46:31 -07:00
cib
e9fc666cdb Removed hijack from wizard. 2013-05-24 00:12:29 +02:00
cib
0bfb43b864 Removed hijack objective. AGAIN. 2013-05-24 00:09:47 +02: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