Commit Graph

1733 Commits

Author SHA1 Message Date
Hawk-v3
17f128cb02 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-03-06 19:24:38 +00:00
Ren Erthilo
87502c38b7 Made emagged cyborgs laws gender neutral and use crew. Small reset module description change. 2012-03-06 10:22:34 +00:00
cib
37f6e216c1 Fixes to available skills. 2012-03-05 23:50:59 -08:00
SkyMarshal
d19c9012a7 Detective UI update. 2012-03-05 20:08:38 -07:00
SkyMarshal
aa0c6b9aa8 Adjusted the Examine for humans some. Why the hell is this crashing clients? 2012-03-05 19:46:37 -07:00
SkyMarshal
3cb0a51b7f Fixed a smidgen of derpiness with that last code. 2012-03-05 17:22:52 -07:00
SkyMarshal
43f7487429 Some optimizations for fingerprints. General debugging. 2012-03-05 16:33:47 -07:00
SkyMarshal
8ae86d253f Fixed some stupid. 2012-03-05 12:52:01 -07:00
SkyMarshal
7534154fa2 Cleaned up some code, fixed a bug with dead/sleeping people seeing you talk into headsets, reworked guncode some, readded point-blank shooting, removed disposal space cannon, hacktool works on windoors and secure closets, now. 2012-03-05 12:27:55 -07:00
cib
93c91b6018 You can no longer extract chemicals directly from blood.
Derp me, I didn't know extracted blood had a trace chemicals variable.
2012-03-05 10:45:26 -08:00
Ren Erthilo
b92ecb932b Added custom items. Small fix for labcoat buttons and descriptions. 2012-03-05 17:52:28 +00:00
cib
cd30ab13b3 Fixed machinery operating skill description. 2012-03-05 09:46:19 -08:00
cib
b6da27699e Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-05 09:45:16 -08:00
SkyMarshal
3c9fe5a27f Merge pull request #624 from Miniature/master
custom item for Tzefa
2012-03-05 08:03:50 -08:00
Miniature
56c2305c3f Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-05 18:42:09 +10:30
Miniature
1e75d4cec8 custom item for Tzefa 2012-03-05 18:40:54 +10:30
cib
4c93cda368 Slowed down the rate at which most chemicals are absorbed. This may still need balancing in some areas. 2012-03-04 17:15:43 -08:00
cib
88c8893cdb Fuel tanks can now be ignited by fire. 2012-03-04 16:28:41 -08:00
Albert Iordache
4bd3920b66 Merge pull request #622 from SkyMarshal/master
Fixed headsets, made the AI so you can unbolt it and have an awesome pal.
2012-03-04 10:44:11 -08:00
SkyMarshal
f42355282d Fixed headsets, made the AI so you can unbolt it and have an awesome pal. 2012-03-04 11:39:43 -07:00
Ren Erthilo
ba38c4b11f Tweaked overdose values so sleepers don't leave any toxin damage. 2012-03-04 16:05:00 +00:00
Ren Erthilo
65bb420d62 Fix for AI command network camera bug. 2012-03-04 13:42:54 +00:00
Albert Iordache
3fcf067310 Merge pull request #613 from SkyMarshal/master
Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event, fixed Tajspeak, fixed the blob, fixed overdoses
2012-03-03 23:55:37 -08:00
SkyMarshal
884fd25f78 Fixed the rest of Tajspeak, radios now give a cue when someone talks into it, fixed throwing and tables, fixed bloodiness, fixed autofiring vars.
You can throw over tables again.
Fixed some bloodiness not being added.
Fixed some vars not being reset.
2012-03-03 23:45:20 -07:00
Albert Iordache
1575df93ce Merge pull request #614 from comma/master
Some derpfixes
2012-03-03 22:26:54 -08:00
comma
5ad05105f4 Small bugfix to ashtrays and cig butts
Now can throw out ashtray shards. 'ciguarete butt butt' should not appear anymore.
Also glass ashtray now shatters with sound
2012-03-04 06:45:14 +02:00
SkyMarshal
6ab370768b Nerfed overdose damages. 2012-03-03 21:20:42 -07:00
SkyMarshal
0a31e76f0f Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-03 20:26:49 -07:00
SkyMarshal
3e3534f00b Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event.
Map update has a redone CE's office and AI upload.
Explosions now let admins jump to them.
2012-03-03 20:23:10 -07:00
Mloc
8ae3d23684 Merge pull request #611 from SkyMarshal/master
Fixes for package wrap, added proper buttons and hotkeys to the gun system, fixed PDA manifest.
2012-03-03 14:41:01 -08:00
SkyMarshal
c2bf323caa Fixed some screwwy icon stuff from the last commit, fixed an overlay not updating. 2012-03-03 15:22:33 -07:00
SkyMarshal
4187374e5b Merge pull request #610 from Erthilo/master
Fixed Super Bite Burger recipe
2012-03-03 14:09:08 -08:00
SkyMarshal
1107f6e768 Fixes for package wrap, added proper buttons and hotkeys to the gun system, fixed PDA manifest. 2012-03-03 15:08:01 -07:00
Ren Erthilo
a5c3dc204b Fixed Super Bite Burger recipe. 2012-03-03 21:22:11 +00:00
Albert Iordache
24c69ce0fb Merge pull request #608 from CIB/master
Change to bloodloss
2012-03-03 07:46:09 -08:00
cib
c3e2bec97f Bloodloss now uses brute instead of burn. 2012-03-03 07:44:25 -08:00
SkyMarshal
0dfd3abb06 Merge pull request #603 from SkyMarshal/master
Fix for bloodying shoes when you walk in blood.
2012-03-02 19:15:17 -08:00
SkyMarshal
1e4bdf7183 Fix for bloodying shoes when walking in blood. 2012-03-02 20:14:27 -07:00
SkyMarshal
1e7d3c380b Merge pull request #599 from CIB/master
Skill specialization
2012-03-02 17:48:44 -08:00
cib
d79bdaa6b9 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-02 17:41:01 -08:00
SkyMarshal
ff5b05d1cf Fixed a gamebreaking bug involving examining and organs. 2012-03-02 18:34:23 -07:00
comma
ef6473b964 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Now working
And without promoting myself as Game Master :P

Signed-off-by: comma <krauchinsky@gmail.com>
2012-03-03 03:16:30 +02:00
Hawk-v3
fe70dccc58 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-02 22:57:14 +00:00
cib
1097cc8e7c Added skill field specialization. 2012-03-02 14:44:47 -08:00
Albert Iordache
0fe9ef55c2 Merge pull request #586 from CIB/master
Some enhancements to the monkey AI
2012-03-02 12:25:46 -08:00
comma
ee09389f5b Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-03-02 22:04:20 +02:00
comma
2edd73627d Added ashtrays
Breakable. Spill contents on breaking or hitting the solid stuff after being thrown.
Have limited capacity. Can be emptied in disposal outlet.
Change sprite when are half-filled and filled.
Also fiddled a bit with the cigs code, so you can put them out without dropping.
2012-03-02 21:56:08 +02:00
Albert Iordache
38ac469e88 Merge pull request #595 from Erthilo/master
Changed AI laws to use crew instead of human and added new Ion Laws. Left Asimov unchanged. Added changelog to changelog.
2012-03-02 11:11:58 -08:00
Hawk-v3
bc84c1efb0 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-02 19:07:44 +00:00
cib
20394e1f56 Whoops, forgot to push a file! 2012-03-02 10:58:16 -08:00