Commit Graph

2104 Commits

Author SHA1 Message Date
StrumpetPlaya
32811b1b9d Fixed runtime error involving cyborgs and fibers.
Also changed Show Server Revision at Head's request.  Can't really test it
locally so hopefully this is what he meant.
2011-12-10 11:27:48 -05:00
Albert Iordache
2d4e356d8c Merge pull request #86 from CIB/master
Made some improvements to the player info panel
2011-12-10 06:22:22 -08:00
Albert Iordache
41dedca7b9 Merge pull request #85 from Tastyfish/master
added categories to QM ordering/request stuff so it isn't a giant several-page list
2011-12-10 02:42:21 -08:00
Albert Iordache
c68a22f497 Merge branch 'SkyMarshal-764432e' 2011-12-10 12:35:15 +02:00
Albert Iordache
5d2dfbcff7 Thermals now look like regular sunglasses. Added some special engineering emergency oxygen tanks to engineering. 2011-12-10 12:29:02 +02:00
Albert Iordache
6c992058e4 Code cleanup + gravitational anomaly readded 2011-12-10 11:59:40 +02:00
Albert Iordache
64106be003 Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90
Lot of tweaks and fixes, read the description.
2011-12-10 01:43:34 -08:00
Tastyfish
61ae382c16 added categories to QM stuff so it isn't a giant several-page list 2011-12-10 01:25:27 -05:00
cib
3a27c74b46 Some small improvements to the player info panel. 2011-12-09 15:12:01 -08:00
Albert Iordache
ae34949324 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-09 18:58:32 +02:00
Albert Iordache
3efa552eda Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
2011-12-09 14:56:32 +02:00
Tastyfish
afd1aca53b let everyone do me emotes properly! (bots,monkeys,...) 2011-12-09 02:24:33 -05:00
SkyMarshal
764432e4e8 Fixed minor errors. 2011-12-08 22:13:51 -07:00
SkyMarshal
61d21b3cab Added the ability for borgs to ude departmental radios 2011-12-08 22:02:46 -07:00
cib
5b349cc549 Revert "Moved the singularity and particle accelerator a bit out of the station. Added some stuff to engineering and generally organized it a bit."
This reverts commit a6e7d09620.
2011-12-08 20:47:37 -08:00
cib
11bf4a45a5 Added a "player info" option to the player panel that will allow you to make notes on a specific player etc. 2011-12-08 20:43:20 -08:00
cib
4b7c6c5183 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-08 18:44:43 -08:00
unknown
8f11c4acfb DO NOT USE. 2011-12-08 17:07:25 -07:00
SkyMarshal
3319b22adf Remove killbot ref. when you make an ED-209, reversed list order for QM requests and orders. 2011-12-08 15:08:03 -07:00
SkyMarshal
b5018a8aa3 Removed thermals from traitor objectives. 2011-12-08 14:29:21 -07:00
SkyMarshal
dafbfe6edd Replaced an accidentially blanked part of flavor text 2011-12-08 14:25:24 -07:00
SkyMarshal
009d0915bf Removed most other cyanide references. Remade cyanide pills into suicide pills (100 units of Toxin) 2011-12-08 14:22:45 -07:00
SkyMarshal
ff8ca07714 Removed accelerated shuttle launch. 2011-12-08 14:05:14 -07:00
SkyMarshal
6f88b4f981 Forgot to remove the entry from the table the random event switch looks at. 2011-12-08 13:57:26 -07:00
SkyMarshal
0da1bea7c0 Add BS12 Space Law, remove Gravitational Anomaly event 2011-12-08 13:51:10 -07:00
SkyMarshal
d7eb6e4ae6 Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker 2011-12-08 12:35:10 -07:00
Albert Iordache
dd6ddaa8c3 Revert "removed cloaker"
This reverts commit 1fa97843f8.
2011-12-08 15:28:35 +02:00
Albert Iordache
00e8e13d1e Merge pull request #76 from Tastyfish/master
The closet tg merge broke charge crates
2011-12-08 05:27:20 -08:00
Uristqwerty
74c2b7c55b Stealth PM fix: hide stealthmin names in the input box title. 2011-12-07 12:50:05 -05:00
Tastyfish
1fa97843f8 removed cloaker 2011-12-07 12:29:04 -05:00
Tastyfish
e51459600f Merge remote-tracking branch 'upstream/master' 2011-12-07 11:21:50 -05:00
Albert Iordache
51a55e4f7c Merge pull request #78 from Strumpetplaya/master
Cloning fixed.
2011-12-07 03:07:35 -08:00
Albert Iordache
6a445ebd28 Merge pull request #73 from Abi79/master
Removed more fat code
2011-12-07 03:05:29 -08:00
StrumpetPlaya
79c84c9d23 Cloning fixed. 2011-12-07 05:40:33 -05:00
Tastyfish
455b61d9c8 hand labelers have been broken since the first commit.. 2011-12-07 00:32:02 -05:00
Tastyfish
14f0a4d0b9 UnRevert "the closet tg merge broke my charge crates"
This reverts commit 2694238e88.
2011-12-06 21:04:41 -05:00
Tastyfish
ecb6f2b2d6 Revert "the closet tg merge broke my charge crates"
This reverts commit 2694238e88.
2011-12-06 21:00:08 -05:00
Tastyfish
ac627aa521 Merge branch 'master' of github.com:Tastyfish/Baystation12 2011-12-06 20:36:20 -05:00
Tastyfish
2694238e88 the closet tg merge broke my charge crates 2011-12-06 20:35:07 -05:00
Miniature
af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
2011-12-07 07:53:20 +10:30
Miniature
5fec6c6319 DM why you so shit 2011-12-07 07:46:08 +10:30
Albert Iordache
92045315a3 Merge pull request #72 from Strumpetplaya/master
Security now has maintenance access.
2011-12-06 09:46:00 -08:00
Albert Iordache
9dc2644e51 Commented out more of the fat code, for issue #71. 2011-12-06 19:23:25 +02:00
Albert Iordache
6a62c3b8ff Merge pull request #71 from SkyMarshal/master
Removed obesity upon overeating
2011-12-06 08:48:06 -08:00
uporotiy
df04d75c48 Aaaaaaaaaand once again I forget to upload a new file.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2629 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 15:04:11 +00:00
baloh.matevz@gmail.com
cb19629c18 Wrenches no longer spawn with a random pixel offset to the right.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2628 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 14:39:19 +00:00
cib
a6e7d09620 Moved the singularity and particle accelerator a bit out of the station. Added some stuff to engineering and generally organized it a bit. 2011-12-06 05:24:43 -08:00
StrumpetPlaya
508df5d3cb Nobody spawns with internals anymore. 2011-12-06 07:35:33 -05:00
StrumpetPlaya
4489db546d Added detective stuff - fibers.
Left out bloody footprints for now.  Not sure we want that with the
current system of corpses dropping blood spatters all around when dragged.
2011-12-06 07:12:19 -05:00
StrumpetPlaya
bbd04aa2aa Security now has maintenance access.
Security also has access to medical/research hallways.
Assistants no longer have maintenance access.
2011-12-06 06:04:34 -05:00