Commit Graph

1550 Commits

Author SHA1 Message Date
Miniature
56f2f1e9ad Fine then, it shall be capitalized. 2012-03-10 16:41:43 +10:30
Miniature
aa5489cee3 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-10 06:37:14 +10:30
Miniature
1b5ca75774 Merge branch 'master' of github.com:Miniature/Baystation12 2012-03-10 06:36:24 +10:30
Miniature
8c9355f028 Custom item for Chinsky 2012-03-10 06:35:35 +10:30
cib
4224b2401f ERT spawn button now in secrets. 2012-03-08 15:37:20 -08:00
Tastyfish
f7e857d45c Merge remote-tracking branch 'upstream/master' 2012-03-08 00:47:27 -05:00
Tastyfish
6874cc03d1 cleaned up the paths of a few ported things 2012-03-08 00:46:24 -05:00
SkyMarshal
df5909446e Merge pull request #634 from Miniature/master
Attack logging (finally)
2012-03-07 20:49:02 -08:00
Miniature
cf53a0cc7a Attack logging (finally)
there might be some things I missed, and feel free to change the messages if you want
2012-03-08 15:16:54 +10:30
SkyMarshal
8e96007b35 Merge pull request #631 from Erthilo/master
Hypospray can now fit on medical belt. Fixed torso bugs. Fixed custom item derp. Small typo fixing.
2012-03-07 16:38:52 -08:00
Ren Erthilo
55d316ee9d Added female torso, so both genders don't use the same one. Repositioned torso when lying down to stop red pixels. Small changes to custom uniforms. 2012-03-08 00:31:37 +00:00
SkyMarshal
7456fb7eae Merge pull request #623 from CIB/master
Look, there's a lot of stuff in here now, just read the commits
2012-03-07 13:26:37 -08:00
SkyMarshal
e48a8a17e6 Can't target ghosts anymore. 2012-03-06 21:23:52 -07:00
SkyMarshal
c522b5db7b Holy shit did that speed things up. 2012-03-06 21:09:56 -07:00
cib
209162c25e Renamed the "None" skill level to "Layman". 2012-03-06 19:50:03 -08:00
cib
2d99674561 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-06 19:44:43 -08:00
SkyMarshal
f0b3802b10 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-03-06 19:10:39 -07:00
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