cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,250 Commits 9 Branches 0 Tags
a6c6c44112c39f8e27a8c1e735e856c6c10e35ff
Commit Graph

2424 Commits

Author SHA1 Message Date
CaelAislinn
a6c6c44112 ported z-levels from old bs12. ready for implementation into map/s 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-05 22:03:43 +10:00
CaelAislinn
0a70d83f57 re-adding fixed ul + new helper proc (get_opposite()) 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-05 15:37:02 +10:00
CaelAislinn
75757a29cf fixed conveyors. was something weird happening with antiqua, shouldn't be any changes 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-05 15:30:15 +10:00
Albert Iordache
7aac3d5e1c Fixed a radiation belt runtime error 2012-01-05 01:10:07 +02:00
Albert Iordache
86186aa089 Fixed a few occurrences of "ship" instead of "station", in events 2012-01-05 00:44:40 +02:00
cib
e141f962c4 Confusion shouldn't make you totally unable to move in one direction. 2012-01-04 22:32:09 -08:00
cib
cb78753345 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-04 22:10:37 -08:00
cib
66f6d325a4 Increased infection chance significantly in the hopes that this will somehow help vira not spreading. 2012-01-04 22:07:26 -08:00
cib
757bdc08f2 You can now produce infected blood from a virus dish with the cure research machine. 2012-01-04 19:16:35 -08:00
Albert Iordache
f7e22b104b Merge pull request #212 from CIB/master 
Make it possible to infect people from virus dishes
 2012-01-04 10:45:36 -08:00
CIB
bd533a1a8a Merge pull request #211 from SkyMarshal/master 
Should help balance my last set of changes.
 2012-01-04 10:24:53 -08:00
SkyMarshal
b2e25d39b8 This should work, not sure. 
Signed-off-by: SkyMarshal
 2012-01-04 11:08:47 -07:00
CIB
8865f71cb6 Merge pull request #209 from Abi79/master 
Fixed a case where the player panel wouldn't open
 2012-01-04 09:59:25 -08:00
cib
7b56f2e534 Disable control_freak, jesus. 2012-01-04 18:20:44 -08:00
Albert Iordache
9c2224e6d8 Fixed a case where the player panel wouldn't open 
This shouldn't even happen :O
 2012-01-04 14:29:16 +02:00
Miniature
5a5c620692 Now atmos alarms automatically let atmos techs change them if they go off, as well as people can turn that off or make them permamently controllable by the computer 
also made it possible for them to mess with any alarm that hasn't had the atmos control completely disabled, but not a way to turn that feature on
 2012-01-04 22:52:01 +10:30
Miniature
ea70303f21 Another one 2012-01-04 17:02:35 +10:30
Miniature
a898a49c3c Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-04 17:00:34 +10:30
Miniature
c9a20d7a12 another runtime 2012-01-04 16:57:40 +10:30
Albert Iordache
33833b9acb Merge pull request #202 from SkyMarshal/master 
OHMYGOD I coded a ton.
 2012-01-03 11:14:20 -08:00
SkyMarshal
f78e044226 Tweaked electrical storms 2012-01-03 12:09:02 -07:00
SkyMarshal
1750d044cf Added blowout, easier management of disallowed events. 2012-01-03 12:03:14 -07:00
Miniature
499198b1cf More runtime fixing 2012-01-04 04:36:21 +10:30
Albert Iordache
08ab4448b8 Merge pull request #194 from Miniature/master 
bunch of emlocker stuffs, also a couple of runtimes
 2012-01-03 09:03:18 -08:00
Miniature
719c6a3b31 Don't ask me why this didn't work already, another runtime fixed 2012-01-04 03:22:07 +10:30
Miniature
8aba29cc9c Fixing some null runtimes 2012-01-04 03:15:20 +10:30
Miniature
9a81f4496b Finished emlocker stuff 
if someone wants to move where the spawning is done feel free
 2012-01-04 02:15:38 +10:30
SkyMarshal
9a651a5a84 Added psyche jumpsuit for Asanadas 
Expanded scrambled radio stuff.
 2012-01-03 00:06:25 -07:00
SkyMarshal
120607828e Fixed random AI laws. 2012-01-02 22:39:42 -07:00
SkyMarshal
72c6369368 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-02 21:49:09 -07:00
SkyMarshal
411ccc4075 Shitload of stuff. 2012-01-02 21:48:42 -07:00
Tastyfish
7abc22bf78 make pailiza tell parser less confusing 2012-01-02 18:52:38 -05:00
Tastyfish
3c15526e3f accidentally called the wrong unequip proc, they're all so similar! 2012-01-02 12:52:09 -05:00
SkyMarshal
78660a2dff Merge pull request #197 from SkyMarshal/master 
Bugfix.
 2012-01-02 09:09:12 -08:00
SkyMarshal
fbf59a3411 Fix compile error. 2012-01-02 10:08:30 -07:00
Albert Iordache
bdd5205bfe Merge pull request #196 from SkyMarshal/master 
PDAs can now fit in all belts
 2012-01-02 09:04:45 -08:00
SkyMarshal
2f0a745815 PDAs can now fit into all belts. 2012-01-02 10:01:57 -07:00
Tastyfish
4de9164a5b Merge remote-tracking branch 'upstream/master' 2012-01-02 11:47:20 -05:00
Tastyfish
87a14c0674 machine ingredient adding more intuitive 2012-01-02 11:46:19 -05:00
Tastyfish
bf877d0483 Merge pull request #191 from SkyMarshal/master 
Nuclear revamp, full details in description.
 2012-01-02 08:18:25 -08:00
SkyMarshal
6537219768 Explosive implants should go off more reliably. 2012-01-02 09:09:43 -07:00
Miniature
806a8d1c1a First bunch of emlocker stuffs, going to fix when its not 1am and 24C 2012-01-03 01:38:01 +10:30
Tastyfish
024120e4a3 Merge pull request #193 from Abi79/master 
TG conveyor2 update
 2012-01-02 06:37:53 -08:00
Albert Iordache
d9683ef4e3 Merge pull request #192 from caelaislinn/master 
Autolathe changes, new supply crates, slight cargo bay tweaks
 2012-01-02 06:36:03 -08:00
Albert Iordache
72941bb8c9 Merge pull request #190 from Tastyfish/master 
fixed cult low-player problem, piano movable, straight jackets
 2012-01-02 06:17:58 -08:00
petethegoat@gmail.com
ee7cd1474e TG update: Added corner conveyor belts. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2693 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-02 15:52:10 +02:00
Tastyfish
2d91693a3b Merge remote-tracking branch 'cael/master' 2012-01-02 08:49:52 -05:00
CaelAislinn
fe228850c8 Added old BS12 walllockers and emergency lockers, added emergency lockers to tgstation208.dmm, removed stamp eraser from supply crate, minor antiqua tweaks 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 23:47:28 +10:00
Tastyfish
8000b5be66 why did I make an afterthought commit changing it to the wrong thing.. 2012-01-02 08:40:56 -05:00
Tastyfish
e2a6f68e00 Merge remote-tracking branch 'cael/master' 2012-01-02 07:43:23 -05:00