Commit Graph

1564 Commits

Author SHA1 Message Date
Tastyfish
5628272bde fixed typo in piano 2011-12-31 17:28:19 -05:00
Tastyfish
c02979c148 Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, intercoms, status displays, and light switches 2011-12-31 12:28:26 -05:00
Tastyfish
c654a3d8d8 fixed derp on vote announcement for custom vote 2011-12-30 23:41:06 -05:00
Albert Iordache
39b6dd57e0 Removed and commented out the last traces of goon auth. code 2011-12-30 23:28:14 +02:00
cib
df4419da1e Changed the genetics manual. 2011-12-30 19:43:01 -08:00
SkyMarshal
0fe2cdab96 Added multiple string search to security records, fixed some evidence bag bugginess, fixed problem with the stamp remover. 2011-12-30 09:15:04 -07:00
SkyMarshal
5ab20fdf55 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/items/weapons/uplinks.dm
2011-12-29 10:08:58 -07:00
SkyMarshal
9ad0bc5c89 Can compile, now. 2011-12-29 10:01:19 -07:00
cib
b5f8c930f1 Revert SkyMarshal's last commits since they don't even compile, which means they weren't tested.
Revert "Alien removal surgery, new traitor item, other stuff."

This reverts commit cc3bc60963.
2011-12-29 15:15:51 -08:00
Tastyfish
f3145486cc Merge remote-tracking branch 'upstream/master' 2011-12-29 08:38:42 -05:00
Tastyfish
8745b6bd40 pAI chatbot pal for when ghost aren't pAI'ing;
borgs can't move when no charge;
fixed misplaced light in RD office
2011-12-29 08:38:40 -05:00
CIB
6fbe9cb7bf Merge pull request #167 from SkyMarshal/master
*sigh* Check the description
2011-12-29 05:23:24 -08:00
CIB
b7349e7fa1 Merge pull request #166 from CIB/master
Improved on medical a little, adding traumatic shock
2011-12-29 05:21:52 -08:00
cib
bf29dc3a69 Cloning now leaves you on the verge of death again(though not in critical). 2011-12-28 23:55:36 -08:00
SkyMarshal
22d5d2cd3d Small error with the new traitor item. 2011-12-28 23:23:42 -07:00
SkyMarshal
cc3bc60963 Alien removal surgery, new traitor item, other stuff. 2011-12-28 23:15:30 -07:00
SkyMarshal
43c2285a93 Fixes and stuff. 2011-12-28 14:27:52 -07:00
Albert Iordache
02f017e216 Merge pull request #163 from Tastyfish/master
buildable disposals, can make power module, fixed piano
2011-12-28 05:34:16 -08:00
Tastyfish
46520c3e57 accidentally didn't allow a natural in piano, thought it sounded weird! 2011-12-28 07:02:55 -05:00
Tastyfish
6e95fc4f1d better yet, let both apc module and disposal circuit be creatable in autolathe 2011-12-28 06:12:21 -05:00
Tastyfish
83ce12e7c3 disposal destructable, can develop disposal circuits now 2011-12-28 05:53:49 -05:00
Tastyfish
f6006bfd1f disposal buildable via machine frame 2011-12-28 05:03:21 -05:00
Albert Iordache
99ea2b30d8 Fixed a clonepod runtime error with Tasty's help 2011-12-28 11:31:07 +02:00
Albert Iordache
909975cab9 Attempted to fix a runtime error. 2011-12-28 11:11:45 +02:00
Tastyfish
f1fcbf3445 can set the paint scheme of doors! 2011-12-28 03:22:59 -05:00
Tastyfish
99c1df3ff4 only force AI if malf mode 2011-12-28 01:18:16 -05:00
Tastyfish
f378644bb0 constructable/destroyable lights! 2011-12-27 22:13:18 -05:00
Tastyfish
0e222e838f replaced "toggle pregame music" with button in pregame screen that saves between games 2011-12-27 19:53:02 -05:00
SkyMarshal
08ff9b06e7 Fixed several things. 2011-12-27 13:44:52 -07:00
Albert Iordache
9219a22f14 Merge branch 'master' of https://github.com/SkyMarshal/Baystation12 into Sky
Conflicts:
	maps/tgstation.2.0.8.dmm
2011-12-27 17:08:52 +02:00
Albert Iordache
4139004c35 Changed the number of changelings to 1 per 10 playas 2011-12-27 14:56:51 +02:00
Albert Iordache
2092e25983 Merge pull request #147 from Tastyfish/master
coats, changeling, piano, also admins can delete books, paper/books more robust against dynamic content, custom votes
2011-12-27 04:26:51 -08:00
SkyMarshal
607db09620 Lotsa stuff. Map update. 2011-12-26 17:59:09 -07:00
CIB
e2d698f376 Merge pull request #150 from MisterFox/master
Retired Admins rank
2011-12-26 15:47:25 -08:00
baloh.matevz
1ac1376806 TG update: Fixed the meteors not exploding on impact error.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2685 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:46:05 +02:00
petethegoat@gmail.com
7cc0842cae TG update: minor pipe code issues.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2684 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:45:34 +02:00
uporotiy
ab396f50ac TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2683 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:39:45 +02:00
LastBattaWolf@hotmail.com
158630c86e TG update: removed title music from bar
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2682 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:33:20 +02:00
Albert Iordache
ef0a9b3632 TG update: Added Reactive Teleport armour and on/off sprites for the armour. Click in hand to toggle on/off (like a cloaking device). When worn and activated, successfully blocked attacks will cause the wearer to warp randomly up to 8 tiles. EMPs will disable it. Values may need tweaking to balance the armour. One set now spawns in the RD's office to it will get used/tested, depending on how that goes I may move it to being produceable by the protolathe only, or remove it entirely etc
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2680 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 23:30:34 +02:00
Mister Fox
19b8a17557 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-26 14:07:48 -05:00
Mister Fox
30f4e7dea1 Retired Admins rank for retired admins
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com>
2011-12-26 13:59:20 -05:00
baloh.matevz
12e851dd3b TG update: Hopefully made meteor mode more deadly.
Fixed meteor spawning so all the meteors that are set to spawn actually hit, but noticed that 50 meteors every 5 seconds proved itself to be way too laggy when all of them actually spawned properly and aren't deleted at soon as they're created due to being on the map's edge. Instead I lowered it to 6 per second.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2679 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 20:36:57 +02:00
petethegoat@gmail.com
e87ca09537 TG update: Tiny fix for table disassembly.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2677 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 20:34:50 +02:00
Albert Iordache
1fac967212 TG update: Added the (almost finished) displacer. One minor bug with it to work out, does not actually spawn anywhere though so it shouldn't effect anything. Will try to finish it later tonight. 2011-12-26 20:30:45 +02:00
rockdtben
f38a590009 TG update: Removed a proc that does nothing anymore.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2675 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 20:19:12 +02:00
rockdtben
382b6681fd TG update: ... -Removed setBruteLoss and setFireLoss since they served no purpose. -Overrided the proc for get[Fire/Brute]Loss and adjust[Fire/Brute]Loss for humans to use the total damage proc. -Removed redundant checks aka setBruteLoss(max(getBruteLoss(), 0) since the adjust brute proc already prevents it from going negative. -Commented out the UpdateDamage() procs contents as it did nothing. If problems arise we might have to investigate. Soon I will remove the proc entierly.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2673 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-26 20:14:44 +02:00
Tastyfish
78ed748eab Merge remote-tracking branch 'upstream/master' 2011-12-26 11:24:39 -05:00
Tastyfish
0e0da0bdbb custom votes 2011-12-26 11:24:28 -05:00
Albert Iordache
87941b7081 Merge pull request #146 from SkyMarshal/master
Check that description.
2011-12-26 07:21:52 -08:00
Tastyfish
661888ac11 made paper exploit blocker more robust. i still don't quite want to block images /yet/ 2011-12-26 06:24:13 -05:00