Commit Graph

4802 Commits

Author SHA1 Message Date
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
4d7cfb5e34 Another mapupdate, de-nerfed blob, readded the missing Tajaran speak. 2012-03-03 21:08:49 -07:00
SkyMarshal
0a31e76f0f Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-03 20:26:49 -07:00
SkyMarshal
ba9b919211 Whoops. 2012-03-03 20:26:33 -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
CIB
a903c8d152 Merge pull request #607 from Erthilo/master
Quickfix for invisible jetpacks. Fix for roller beds.
2012-03-03 10:32:08 -08:00
Ren Erthilo
d786d8642f Fixed roller bed. 2012-03-03 18:06:40 +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
Hawk-v3
9d69c86308 Fixes compile Errors, take it away with the doors, Sky! 2012-03-02 22:55:42 +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
Ren Erthilo
79501f3111 Changed AI laws to use crew instead of human. Left Asimov unchanged. Added more Ion Storms laws. 2012-03-02 18:25:28 +00:00
SkyMarshal
e42086f771 Fixed up the verb. 2012-03-02 10:06:16 -07: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
4596337f75 Merge pull request #590 from Iberis/master
Antiqua, now correctly.
2012-03-01 21:30:01 -08:00
Iberis
bcf81e8913 Fixed the area conflict with the tg station. 2012-03-02 06:26:26 +01:00
SkyMarshal
ee9146cda4 Added more sanity checks to the gun code. 2012-03-01 22:15:03 -07:00
SkyMarshal
fd1a3bd6b8 Missed an update, whoops! 2012-03-01 20:13:02 -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
Iberis
fcd7274997 Added CrewQuarters. Some Areas.
Polish
2012-03-01 23:51:34 +01:00
Hawk-v3
c85e6c5283 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-01 22:12:03 +00:00
cib
234d4b1a0d Fixed compile time error. 2012-03-01 14:10:18 -08:00
Hawk-v3
4baad32c6a Revert "Subject: [PATCH 089/285] TG Updates: Finally ready to like add this now oh man this is a huge thing sort of Added CC-Nanotrasen, an IRC bot"
This reverts botchanges.
2012-03-01 22:09:24 +00:00
Hawk-v3
bfac567c87 Revert "Subject: [PATCH 093/285] TG Updates: Added a brown mining airlock."
This reverts commit 243d1f2fab.
2012-03-01 22:04:28 +00:00
Hawk-v3
7ab7acdfba Food Fix 2012-03-01 22:00:05 +00: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
kortgstation@gmail.com
a9e575e5fb Tg Update: Cyborgs will no longer drop shit everywhere when hit by the Staff of Change.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2789 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 21:38:24 +00:00
Hawk-v3
243d1f2fab Subject: [PATCH 093/285] TG Updates: Added a brown mining airlock. 2012-03-01 21:36:30 +00:00