Commit Graph

881 Commits

Author SHA1 Message Date
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
cib
20394e1f56 Whoops, forgot to push a file! 2012-03-02 10:58:16 -08:00
SkyMarshal
eab449cbbb Added a "Deadman's switch" (Not really) to the signaler, shooting while standing off makes the other guy shoot, balanced stunning, added a time limit to switching hostage modes.
Signalers: Right click verb makes you ready to signal it, being shot with it in your active hand has a 80% chance to trigger it, dropping it has a 5% chance.
Stunning always stuns you SOME, but armor can now lessen it (It used to be possible to not get stunned at all by being shot normally)
Shooting during a mexican standoff now makes the other guy shoot you too.
Added a time to how quickly you can adjust hostage things.  1.5 seconds per thing.
2012-03-02 09:41:03 -07:00
SkyMarshal
ee9146cda4 Added more sanity checks to the gun code. 2012-03-01 22:15:03 -07:00
SkyMarshal
0d8c7d5e51 Reworked the gun system to handle hostage scenarios better.
Ported and adjusted with permission from Lost Worlds.
2012-03-01 19:20:39 -07:00
cib
e0a919be43 Monkeys now react to being attacked by doing emotes and trying to run away. 2012-03-01 16:03:55 -08:00
cib
234d4b1a0d Fixed compile time error. 2012-03-01 14:10:18 -08:00
cib
dfc6ed3abf You can now look at your own skills mid-round.
And so can admins.
2012-03-01 13:47:27 -08:00
quartz235@gmail.com
f85abe5414 TG Updates: Undoing my shitty moved_recently thing since petey sweetie actually made do_after not suck
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2771 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 18:51:52 +00:00
Hawk-v3
88390a0010 [PATCH 056/285] TG UPdates: fingerprints on cans now log on any attackby() that isn't a wrench/analyzer/pda/tank; added a 2 minute
countdown var to humans/monkeys that resets when move() is called;(for an actual fix to the cuffbreak bug(NOPE, NOT ACTUALLY IN ~Hawk.)) changed a typo in security levels

committed a gib animation fix for Sieve (todo: make custom gib animations for simple_animals/metroids)
2012-03-01 03:16:34 +00:00
Tastyfish
1724038ce9 Merge remote-tracking branch 'upstream/master' 2012-02-29 18:50:17 -05:00
Mloc
9cee329958 Merge pull request #563 from SkyMarshal/master
Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space.
2012-02-29 12:51:48 -08:00
SkyMarshal
4524a2ff10 Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space. 2012-02-29 13:48:16 -07:00
Tastyfish
a107607092 custom jobs work in categories correctly now 2012-02-29 15:15:13 -05:00
Miniature
a93c13640a Merge pull request #553 from Miniature/master
runtime fixes
2012-02-28 19:02:37 -08:00
Miniature
47c7ae52b9 fix ai life runtime 2012-02-29 13:25:43 +10:30
CIB
6cacfacf57 Merge pull request #549 from Hawk-v3/master
TG UPDATES
2012-02-28 18:26:18 -08:00