Commit Graph

4131 Commits

Author SHA1 Message Date
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
petethegoat@gmail.com
34f3012e98 TG Update: You can now fit basic pipes directly into wall girders. You probably won't notice this, but it makes things slightly easier for atmos techs.
Several instances of ReplaceWithFloor changed to ReplaceWithPlating- the floor tiles under walls were annoying me. RCDs now create plating instead of floor also.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2786 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 21:29:32 +00:00
Hawk-v3
3079a89516 Commit for next update 2012-03-01 21:22:43 +00:00
Hawk-v3
095299ed0a 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
made by Skibiliano and given to us by him under CC-BY-SA 3.0 licensing WHAT DOES THIS MEAN? It
means all servers running this SVN now have the option to use an easy to configure IRC bot capable
of relaying adminhelps from ingame to the server/channel of their choice.
- Runs on python 2.6 scripts with psyco support
- Relaying can be toggled from config.txt (so you don't runtime with every adminhelp if you decide not to use it)
- Comes with a bunch of other useful and fun tools too
- Added a new global proc, send2irc(msg,msg2) YOU'LL NEVER GUESS WHAT IT DOES CONSIDERING WHAT I JUST MENTIONED
----msg and msg2 are just what text gets relayed to irc, separated by a |, for instancesend2irc(hello, world) would come out as "CC_NanoTrasen: Hello | World
2012-03-01 21:09:27 +00:00
Hawk-v3
ca5f259857 Stuff for next patch. 2012-03-01 21:06:06 +00:00
Hawk-v3
2d61523f61 Subject: [PATCH 087/285] TG UPdates: Meat will now spoil within three minutes at temperatures between 0C and 100C. Rotten meat has
the same nutritional value as normal meat, and can be used in the same recipes. However, it is toxic,
and ingesting a badly-prepared big bite burger can kill you.

Because refrigeration serves a purpose now, the kitchen cold room freezing unit is turned off by default. Chefs should remember to turn the freezer on at the start of their shift.

WRONG WRONG WRONG. Nothing useful changes here, (I hope), but later on when someone makes freezer crates usable, I will be uncommenting this. ~Hawk
2012-03-01 20:55:56 +00:00
Hawk-v3
bdff096c4c Subject: [PATCH 086/285] TG UPDATES:
- Simple event dispatch system.
- atom.forceMove() proc. Ignores density and other Move()restrictions, but calls Exited() and Entered()
- var/emagged moved to /obj/machinery class - anyprob() helper proc.
- Mecha internal damage varsencapsulated.
- Mech Fabricators now require robotics ID to operate. Emag removes this restriction.
- Added Odysseus Medical Exosuit and it's parts. Has integrated Medical Hud and ability to mount medical modules.
- Added Sleeper Medical module for medical exosuits. Similar to common sleepers, but no ability to inject reagents.
- Added Cable Layer module for exosuits. Load with cable (attack cable with it), activate, walk over dismantled floor.
- Added another exosuit internal damage type - short circuit. Short-circuited exosuits will drain powercell charge and power relay won't work.
- You should be able to send messages to exosuit operators using Exosuit Control Console
- Gygax armour and module capacity nerfed.
- Exosuit weapon recharge time raised.
- Bugfix: EMP actually drains exosuit cell and damages it
2012-03-01 20:50:19 +00:00
Hawk-v3
6ced35a88d Stuff for next patch 2012-03-01 20:42:48 +00:00
SkyMarshal
14366e389d Merge pull request #578 from Hawk-v3/master
MORE TG UPDATES
2012-03-01 12:03:50 -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
cib
a3d8d0ac7f Bugfix: Mecha replicators were bugged. 2012-03-01 11:37:03 -08:00
Hawk-v3
9d6e3378af Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-01 19:34:45 +00:00
heisen51@gmail.com
1d4f2f45af TG Updates: Projectile hit message changed. Now, instead of
"<Victim> has been shot by the <projectile>", it's
"<Victim> is hit by the <projectile>".

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2779 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 19:33:26 +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
Hawk-v3
7d9c17f5b5 More manual patchedits. 2012-03-01 19:09:36 +00:00
CIB
899331a58d Merge pull request #575 from Abi79/master
News fixes
2012-03-01 11:00:19 -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
petethegoat@gmail.com
175875fc87 TG Update: do_after() now does its checks every tick, thus preventing people from fucking off for the duration, and coming back just before it finishes.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2770 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 18:46:41 +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