Commit Graph

1347 Commits

Author SHA1 Message Date
Ren Erthilo
331900eb87 Fix for the fix for pulling people lying down. 2012-03-21 19:59:20 +00:00
Ren Erthilo
fd338632c5 Fix for machine messages. Fix for previous health analyser commit. Added New Engineering Space Suits. Prevented wasting resources while fixing cyborgs. 2012-03-21 19:30:48 +00:00
CIB
1dd17e60a3 Merge pull request #727 from SkyMarshal/Airlocks
Made appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels.
2012-03-21 10:02:27 -07:00
SkyMarshal
b86cd6bda4 MAde appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels. 2012-03-21 09:46:42 -07:00
Ren Erthilo
9a9d3fc37b Removing some leftover code. 2012-03-21 16:10:15 +00:00
Ren Erthilo
fdb0abce2a * > Made health analysers able to detect bone fractures.
* > Made pulling lying down people slower. Use roller beds people!
2012-03-21 16:08:30 +00:00
Ren Erthilo
db134c759d Merge commit 'stash' 2012-03-20 17:31:49 +00:00
Ren Erthilo
e90493c41b On master: Change 01 2012-03-20 17:31:10 +00:00
CIB
d09ed22439 Merge pull request #708 from SkyMarshal/Airlocks
Fixed give bug, announcement bug, old reaching method, chemicals can now react in mobs, added a light repairing portable-autolathe for janitor.
2012-03-20 06:15:11 -07:00
SkyMarshal
0d2b327ded Chemicals now react in mobs, old reaching restrictions, fixed a give bug, tried to fix a resting bug. 2012-03-18 11:35:52 -07:00
Hawk-v3
5685532e8a Merge pull request #706 from SkyMarshal/Airlocks
Minor tweaks and bugfixes.
2012-03-17 20:56:42 -07:00
SkyMarshal
46c97cbe4e Minor tweaks and bugfixes. 2012-03-17 20:44:16 -07:00
Albert Iordache
c7e32b9d6b Merge pull request #696 from toemik/duration
Minor formatting adjustment to Round Duration. Credit: SkyMarshal
2012-03-17 04:15:35 -07:00
toemik
4bbfe821e4 Minor formatting adjustment to Round Duration. Credit: SkyMarshal 2012-03-17 02:15:21 -04:00
misterfox
64f50d0d04 Tajara stuff 2012-03-16 12:20:42 -04:00
toemik
98aa58dd60 Added Round Duration to Game tab. Also fixed extra "0" in Round Duration in Admin > Secrets panel when minutes are in the double-digits 2012-03-16 02:53:10 -04:00
Mloc
353384efd0 Merge pull request #678 from MisterFox/master
Horrible alternate reality prevention
2012-03-15 14:01:13 -07:00
misterfox
225b9f4224 Prevented a horrible alternate reality where humans have claws 2012-03-15 15:27:29 -04:00
SkyMarshal
f8a956a840 Attempted fix for the examine crashing. 2012-03-15 12:10:19 -07:00
SkyMarshal
53bd5a3441 Some detective work updates. Fixes a runtime, handles blood better. 2012-03-15 12:08:10 -07:00
misterfox
12c3112d21 Chaplain has a regular bible instead of one filled with space cash and booze.
(non-working) Code included for slashing messages/sounds to replace punching for the Tajaran. Unable to make work yet.
Tajaran have universal_speak to 1 by default now.
Tajaran are able to see in the dark now.
2012-03-15 14:44:52 -04:00
SkyMarshal
251654bc9d Give fix (#628), some silly compile fix. 2012-03-13 23:21:37 -07:00
Ren Erthilo
f837ba284d Fixed RIPLEY circuits not appearing in crate. Changed Paramedic to EMT. Made sleeper injection control mode finer but still dangerous. Fixed disconnect examine message. Fixed department computer broken sprites. 2012-03-14 01:53:36 +00: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
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
SkyMarshal
f0b3802b10 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-03-06 19:10:39 -07: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
aa0c6b9aa8 Adjusted the Examine for humans some. Why the hell is this crashing clients? 2012-03-05 19:46:37 -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
cd30ab13b3 Fixed machinery operating skill description. 2012-03-05 09:46:19 -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
65bb420d62 Fix for AI command network camera bug. 2012-03-04 13:42:54 +00: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
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
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
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
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
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