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
kortgstation@gmail.com
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
cib
4b7c6c5183
Merge branch 'master' of github.com:Baystation12/Baystation12
2011-12-08 18:44:43 -08:00
ryantennessee@yahoo.com
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
ryantennessee@yahoo.com
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
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
baloh.matevz@gmail.com
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
n3ophyt3
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
vageyenaman@gmail.com
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
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
baloh.matevz@gmail.com
d1f2c54b17
(forgot one file, but also sending the log from the previous commit)
...
Command intercept will now only increase the security level if it's lower than blue
Added a keycard authentication device. When you interact with it it asks you which event you'd like to trigger, currently only "Red alert". When you select the event, it asks you to swipe your ID card. If you have the new keycard auth access (60) on it (all heads of staff do), it will trigger all other devices of the same type to flash for 2 seconds. If someone with the same access level on their card swipes their card on another device during this period, the event will happen.
The idea behind this is the two key idea from submarine movies - just with ID cards. Admins are informed who requests the event and who triggers it btw, so abusing this is a bad idea.
Added this to the changelog. Hopefully the dme will work properly this time.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2635 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-07 00:55:20 +00:00
baloh.matevz@gmail.com
810dbd7346
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2634 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-07 00:53:09 +00:00
baloh.matevz@gmail.com
73aa4a1afa
hotfix for comms console locking up when you try to change the alert level...
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2632 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 22:43:15 +00:00
baloh.matevz@gmail.com
8636f28d7d
In response to the problems of miner inactivity and a suspicion of the steel change affecting robotics in that mechs, specifically ripleys will no longer be built, I have included some stats logging about mecha construction and mineral production.
...
Also made steel and reinforced glass correctly decrease ore amounts.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2631 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 22:33:23 +00: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
SkyMarshal
68b1be773a
Removed fatness from overeatting
2011-12-06 02:47:50 -07:00
uporotiy
4764cdc990
Aliens:
...
Reworked the code to use a new "plasma" var instead of toxloss for their powers.
Facehuggers are now active for 30 to 60 instead of 3 to 5 seconds.
Aliens can see whether facehuggers are active without needing to examine them.
Changelings:
Ranged sting is now 2 squares-ranged instead of 3 squares.
Space:
Reverted the randomly accessible z-levels back to how they were (derelict and ai sat).
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2627 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 08:30:03 +00:00
Tastyfish
139252dbda
made me accept v/h in form of "me v waves."/"me h shouts!", fixed v/h types of robot emotes, added *help for robots
2011-12-06 00:30:07 -05:00
kortgstation@gmail.com
07dac128c1
Gyrojet bolts now explode on contact with mobs and walls.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2626 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 04:50:42 +00:00