412759a35b
Added Security RIG
2011-12-10 12:48:28 -06:00
9dbe06b22b
Added a notes panel that lists all players that have notes on them.
2011-12-11 02:48:02 +08:00
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
c2eaca7b29
Removed all global modifications of toxloss.
...
Added a setToxLoss() proc.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2653 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-10 14:36:08 +00:00
2d4e356d8c
Merge pull request #86 from CIB/master
...
Made some improvements to the player info panel
2011-12-10 06:22:22 -08:00
46685aba5b
Removed some redundant checks
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2652 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-10 14:14:48 +00:00
e72ae5e8f6
Added a new slurring variable, and set it up in the right places
2011-12-10 14:25:49 +02:00
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
c68a22f497
Merge branch 'SkyMarshal-764432e'
2011-12-10 12:35:15 +02:00
5d2dfbcff7
Thermals now look like regular sunglasses. Added some special engineering emergency oxygen tanks to engineering.
2011-12-10 12:29:02 +02:00
6c992058e4
Code cleanup + gravitational anomaly readded
2011-12-10 11:59:40 +02:00
64106be003
Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90
...
Lot of tweaks and fixes, read the description.
2011-12-10 01:43:34 -08:00
4d00ed6890
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
code/defines/mob/mob.dm
code/modules/chemical/Chemistry-Reagents.dm
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/humanoid/queen.dm
code/modules/mob/living/carbon/alien/larva/life.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/life.dm
maps/tgstation.2.0.8.dmm
2011-12-10 01:11:00 -08:00
61ae382c16
added categories to QM stuff so it isn't a giant several-page list
2011-12-10 01:25:27 -05:00
5a3320f30f
Added a notes panel that lists all players that have notes on them.
2011-12-09 17:45:13 -08:00
d970d2b4f9
Added a drunk variable and a text filter specifically for drunk talking, originally coded by Aryn.
2011-12-09 16:44:13 -08:00
3a27c74b46
Some small improvements to the player info panel.
2011-12-09 15:12:01 -08:00
b8ef575274
Jetpack changing to wrong sprite when turned on fixed.
...
Syringes will autochange inject/draw when full/empty.
Medborg syringes start full and set to inject even though the icon is still messed up.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2650 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-09 20:33:25 +00:00
ae34949324
Merge branch 'master' of github.com:Baystation12/Baystation12
2011-12-09 18:58:32 +02:00
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
afd1aca53b
let everyone do me emotes properly! (bots,monkeys,...)
2011-12-09 02:24:33 -05:00
58265c8629
Hastur Robes (yellow costume) removed from chaplains closet at Urist's command/request.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2649 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-09 06:17:26 +00:00
764432e4e8
Fixed minor errors.
2011-12-08 22:13:51 -07:00
61d21b3cab
Added the ability for borgs to ude departmental radios
2011-12-08 22:02:46 -07:00
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
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
f22a97e982
Added a mint food item/sprite which contains mint toxin
...
Added mint toxin, a poison which will gib fat people upon consumption
Added the mint to the chefs kitchen.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2648 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-09 04:26:15 +00:00
4b7c6c5183
Merge branch 'master' of github.com:Baystation12/Baystation12
2011-12-08 18:44:43 -08:00
08347ddb01
Tracked down the last bottles with limited transfer amounts and made more transfer amounts for them.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2647 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-09 01:22:01 +00:00
24d262f19d
Drills and Ddrills now dig sand faster than shovels. Changed digging to produce 5 glass ore instead of 4.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2646 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-09 01:01:37 +00:00
8f11c4acfb
DO NOT USE.
2011-12-08 17:07:25 -07:00
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
b5018a8aa3
Removed thermals from traitor objectives.
2011-12-08 14:29:21 -07:00
dafbfe6edd
Replaced an accidentially blanked part of flavor text
2011-12-08 14:25:24 -07:00
009d0915bf
Removed most other cyanide references. Remade cyanide pills into suicide pills (100 units of Toxin)
2011-12-08 14:22:45 -07:00
ff8ca07714
Removed accelerated shuttle launch.
2011-12-08 14:05:14 -07:00
6f88b4f981
Forgot to remove the entry from the table the random event switch looks at.
2011-12-08 13:57:26 -07:00
0da1bea7c0
Add BS12 Space Law, remove Gravitational Anomaly event
2011-12-08 13:51:10 -07:00
d7eb6e4ae6
Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker
2011-12-08 12:35:10 -07:00
dd6ddaa8c3
Revert "removed cloaker"
...
This reverts commit 1fa97843f8
2011-12-08 15:28:35 +02:00
00e8e13d1e
Merge pull request #76 from Tastyfish/master
...
The closet tg merge broke charge crates
2011-12-08 05:27:20 -08:00
b30bfac8f9
- added feedback logging for alert levels
...
- alert level descriptions are now part of the config file config.txt
- alert levels default to the ones I had before, if the config file isn't configured.
- Restored a HTML vending machine interface, an updated one. (I have limited time so I'll commit this one too, it's part of the bundle i coded while offline today and I don't have time to separate it before discussing it. I'll revert it later if needed)
Vending machine demo:
http://www.kamletos.si/vending.html
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2641 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-08 11:09:01 +00:00
141977983c
Fixed an issue with the captain's laser.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2640 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-08 06:28:16 +00:00
cc59093135
This should fix the cloning issue. (See: http://nanotrasen.com/phpBB3/viewtopic.php?f=7&t=6502 )
...
Special thanks to the kind folks over at Bay12 for spotting the problem.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2638 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-08 00:46:15 +00:00
74c2b7c55b
Stealth PM fix: hide stealthmin names in the input box title.
2011-12-07 12:50:05 -05:00
1fa97843f8
removed cloaker
2011-12-07 12:29:04 -05:00
e51459600f
Merge remote-tracking branch 'upstream/master'
2011-12-07 11:21:50 -05:00
51a55e4f7c
Merge pull request #78 from Strumpetplaya/master
...
Cloning fixed.
2011-12-07 03:07:35 -08:00
6a445ebd28
Merge pull request #73 from Abi79/master
...
Removed more fat code
2011-12-07 03:05:29 -08:00
79c84c9d23
Cloning fixed.
2011-12-07 05:40:33 -05:00
SHFFLE