Commit Graph

1012 Commits

Author SHA1 Message Date
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
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
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
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
musketstgstation@gmail.com
96fe016964 Fixed an accidental revert of an iconstate change from r2795 (erro, when you change the iconstate mention it in the commit log plzkthx)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2797 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 19:53:29 +00:00
musketstgstation@gmail.com
88ac61af67 TG Updates: Separated empty soul belts and full soul belts for consistency with utility belts.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2796 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 19:52:23 +00:00
baloh.matevz
3230ddcd25 TG Updates: Soulstone belts and engineering belts are not the same things, KOR
Fixed engineers starting with a belt full of soulstones caused by KOR in r2777.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2795 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 19:51:12 +00:00
Hawk-v3
bbc12c6713 Subject: [PATCH 084/285] TG Updates: Cyborgs now get a message that their parent AI has had their laws modified. (For Kor) 2012-03-01 19:31:58 +00:00
Hawk-v3
827552c499 Subject: [PATCH 083/285] Tg Updates: Added the Soul Stone Shard. tl;dr it functions like an intellicard for dead or dying humans.
It will only work on a human if they are in crit/dead, if they actually have a player in them (so corpses where people
have ghosted are immune) and if the soul stone shard is empty.

Right now you can't do anything them other than capture people (and talk to them if you're near the stone)

Added a new belt variety that can only hold shards. Still needs its own sprites.

They currently do not spawn anywhere/are admin only.
2012-03-01 19:19:31 +00:00
quartz235@gmail.com
754b4c6c7d TG Updates: Fixed psychic reinforced table deconstruction
Fixed issue 270
- Changelings now have an "isabsorbing" var to prevent spamming absorb for free chems.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2766 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 18:21:19 +00:00
Hawk-v3
bff678772a [PATCH 064/285] TG UPDATES: Santa's toy bag!
Fixed some miscellaneous stuff to prevent round-start crashing.
2012-03-01 03:25:14 +00:00
heisen51@gmail.com
65afce8818 TG Updates: You now need to stand still for one whole second to place a grille.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2751 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 03:18:16 +00:00
SkyMarshal
122ed8581f Merge pull request #569 from comma/master
Randomized cig butt sprites (5 variations)
2012-02-29 18:55:48 -08:00
comma
e066006f51 Randomized cig butt sprites 2012-03-01 04:44:28 +02:00
Tastyfish
227a6d0541 Merge pull request #567 from SkyMarshal/master
Some fixes for traitor uplinks, added overdoses for some chems by Laser50
2012-02-29 17:00:12 -08:00
SkyMarshal
2b3fbc5047 Merge pull request #566 from Erthilo/master
Added Notebook for the Detective
2012-02-29 16:59:35 -08:00
Ren Erthilo
cf2b6ec28c Added Notebook for the Detective. 2012-03-01 00:23:29 +00:00
SkyMarshal
e8bd665e76 Added overdoses to some chemicals. Fixed some gamemode stuff, involving uplinks. 2012-02-29 17:17:41 -07:00
SkyMarshal
665c2bf7fd Merge pull request #564 from SkyMarshal/master
Tajarn bloody stuff and PDA bugfix
2012-02-29 13:06:35 -08:00
SkyMarshal
3a14201f37 Bugfixes for PDA manifest and bloody Tarjans 2012-02-29 14:05:36 -07:00
Mloc
69399a8cac Merge pull request #560 from comma/master
Melding windows
2012-02-29 12:58:51 -08: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
Chinski
a9e3e2d431 Made full-tile windows meld together like walls 2012-02-29 23:29:41 +04:00
CIB
6cacfacf57 Merge pull request #549 from Hawk-v3/master
TG UPDATES
2012-02-28 18:26:18 -08:00
Tastyfish
373dc5937d Merge pull request #551 from SkyMarshal/master
TG updates, improved nuke.
2012-02-28 17:36:12 -08:00
SkyMarshal
66f38fb34b TG UPDATE: Updates to telecomms, bug&runtime fixes, manifest for all, improved nuclear bomb.
All PDA's can access the manifest.
Nuclear bomb now works on realtime.
Telecomms not mapped yet.
Numerous Runtime Fixes
2012-02-28 18:24:43 -07:00
Hawk-v3
b5a840448b Commit for Patch 53, bugfixin'. Please, as ever, read and check.
Final commit for today.
2012-02-28 23:14:18 +00:00
Hawk-v3
2fe9b995ea Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-28 22:07:45 +00:00
Hawk-v3
883d732b8d Icon Changes for next patches.
Tried to catch the three jetpack changes, and think I got them. If not, the conversion made is here.

 jetpack0(2) > jetpack(2)
 jetpack1(2) > jetpack-on(2)

 voidjetpack0(2) > jetpack-void(2)
 voidjetpack1(2) > jetpack-void-on(2)

 black_jetpack0(2) > jetpack-black(2)
 black_jetpack1(2) > jetpack-black-on(2)

So black_jetpack12 becomes jetpack-black-on2.
2012-02-28 21:45:33 +00:00
Hawk-v3
647b316807 Commits for patch 40. 2012-02-28 20:50:42 +00:00
Ren Erthilo
82ff493455 Added correct colour uniform icons for Med/Sci jobs. Added Virology jumpsuit to wardrobe. 2012-02-28 20:04:24 +00:00
Ren Erthilo
1d858a75a3 Accidentally picked the wrong files... 2012-02-28 19:15:21 +00:00
CIB
27fd036c87 Merge pull request #539 from SkyMarshal/master
Fixed lasers, balanced nuke, removed stupid code, removed Karma, improved admin panel.
2012-02-28 00:44:06 -08:00
SkyMarshal
b653c615be Replaced a lot of stupid from the wardrobes and package wrap, they now use an afterattack call instead of specific code for them in EVERY OTHER ITEM.
Improved the admin panel.
Removed Karma.
2012-02-28 00:11:15 -07:00
Tastyfish
5719daf3d8 fancy new manifest 2012-02-27 21:23:50 -05:00
SkyMarshal
f32b6a6e0c Merge pull request #535 from SkyMarshal/master
Added a missing icon, fixed a wardrobe/evidence bag interaction bug, fixed a nuke radio bug, added another update_clothing() call.
2012-02-27 10:09:45 -08:00
SkyMarshal
f64dcf2e31 Added a missing icon, fixed a wardrobe/evidence bag interaction bug, fixed a nuke radio bug, added another update_clothing() call. 2012-02-27 11:09:07 -07:00
CompactNinja
07b952c0ee Merge pull request #531 from SkyMarshal/master
More update_clothing() calls.
2012-02-26 22:50:54 -08:00
SkyMarshal
54a1a7e640 Added 2 more update_clothing() calls. 2012-02-26 23:49:47 -07:00
CompactNinja
115b507e67 Merge pull request #529 from SkyMarshal/master
Energy projectiles now move instantly, leaving a straight line from their origin to their destination, like real energy weapons.
2012-02-26 22:40:02 -08:00
SkyMarshal
c7af63b281 Energy projectiles now move instantly, leaving a straight line from their origin to their destination, like real energy weapons.
Welderbackpack now has a proper icon.
Stun rounds can now be reduced or blocked by armor
Added more update_clothing() calls
Fixed strangling non-humans.
Blob is now an announcement only.
2012-02-26 23:06:43 -07:00
cib
889d6d93a0 Tons of updates to autopsy.
- Fire, Electrocution, Strangulation, Trace Chemicals and Radiation Poisoning are now detected
- Fixed a bug to head surgery
- You now only hurt subjects on an operating table with a scalpel if your intent is set to harm
- The sheet of paper printed by the autopsy scanner now goes to a free hand if possible
2012-02-27 03:41:24 -08:00
cib
5c5f452cd4 Changes to autopsy.
- Increased the chance to get the murder weapon right.
- New damage types detectable by autopsy: Hot air(fire), explosions, electrocution.
2012-02-27 00:44:25 -08:00
SkyMarshal
f50a3215b6 Singularity can no longer eat the AI's eye mob
Cleaned up how throwing works.
2012-02-25 16:01:00 -07:00
SkyMarshal
74fd808873 Altered functionality of detective scanner.
Fixed that damn book cluster spawning.
Secure doors can now be opened by hitting them with yer hand
Cleaned up surgery tools
People now lie down and stand properly.
For Cajoes: Cleanbot is more robust, and cleans up kitchen messes, now.
2012-02-25 00:17:03 -07:00
Albert Iordache
3c0547f07f Merge branch 'master' of https://github.com/melonstorm/Baystation12 into melonstorm-master
Conflicts:
	maps/tgstation.2.0.8.dmm
2012-02-23 09:53:04 +02:00