cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-20 07:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 7 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

9413 Commits

Author SHA1 Message Date
Tastyfish
abd22255f3 Merge remote-tracking branch 'upstream/master' 2012-01-05 17:15:33 -05:00
Tastyfish
a7b85707dd porting in bones and dismemberment 2012-01-05 17:15:29 -05:00
SkyMarshal
5bd517bf72 Numerous fixes. 2012-01-05 14:33:29 -07:00
cib
bf62258c0a Fixes to AI malfunction and electrical storms. 
- AI malfunction will now be announced, even before it starts the takeover. After 5 minutes by default, after 25 minutes if it buys the interhack module.
- Reduced blackout uses to 1.
 2012-01-05 21:05:36 -08:00
cib
9e035424da Nerfed the medbot and bruise packs. 2012-01-05 19:36:26 -08:00
SkyMarshal
89df766f75 Finial stuff for the mail sorting shit. 2012-01-05 10:22:17 -07:00
Miniature
26d679c469 Merge branch 'master' of github.com:Miniature/Baystation12 2012-01-06 03:24:01 +10:30
Miniature
ac29d2c6dd Now you don't need to call a proc when you use proccall(bs12) 2012-01-06 03:23:22 +10:30
SkyMarshal
98fc5872d3 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-05 09:45:20 -07:00
SkyMarshal
421b49c3f0 Reworked some stuff to actually... work 2012-01-05 09:39:44 -07:00
Miniature
0d65e4657b Now you don't need to call a proc when you use proccall(bs12) 
(leave it blank, i can't remember the way to add a cancel button)
 2012-01-06 02:52:15 +10:30
Albert Iordache
778c6d03e3 Merge pull request #218 from SkyMarshal/master 
Big edit!
 2012-01-05 07:56:30 -08:00
SkyMarshal
dd5c6b9250 Final fix, I think. 2012-01-05 01:02:44 -07:00
SkyMarshal
0f92684f8a Hopefully final commit. 2012-01-05 00:04:42 -07:00
SkyMarshal
582fe30ca8 Getting closer.... 2012-01-04 23:04:55 -07:00
SkyMarshal
20cbc642e2 Another update. 2012-01-04 23:02:57 -07:00
SkyMarshal
873857690d Unfinished commit with a few major changes. DO NOT MERGE. 
Signed-off-by: SkyMarshal
 2012-01-04 22:33:41 -07: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
mport2004@gmail.com
2ea375091e Renamed the prisoner computer's file to prisoner and added a sanity check. 
The singularity is now able to eat things like signs and chameleon projectors' projections.
A few other misc runtime fixes.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2916 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-05 05:26:13 +00:00
Tastyfish
a2ff049861 merge 2012-01-04 23:01:22 -05:00
cib
e141f962c4 Confusion shouldn't make you totally unable to move in one direction. 2012-01-04 22:32:09 -08: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
mport2004@gmail.com
14ed4d5174 Blob ending number of blobs is now a var. 
The nuke now properly checks to see if its on the station when it explodes and most of the derp var has been removed from the bomb code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2913 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-04 13:34:45 +00: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
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
mport2004@gmail.com
07c2afaedb Shades now properly ghost people when they die. 
Changed a nuke feedback back to what it was.
SMES code slightly cleaned up.
Removed a few of the HIGH VOLTAGE signs that were on grilles.
Added a san check to hydro to remove a runtime.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2910 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-03 22:11:09 +00:00
Albert Iordache
33833b9acb Merge pull request #202 from SkyMarshal/master 
OHMYGOD I coded a ton.
 2012-01-03 11:14:20 -08:00
vageyenaman@gmail.com
51ae1dddaa Trying to print the new telecomm machine boards shouldn't crash the R&D machines now. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2908 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-03 18:20:11 +00: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
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
mport2004@gmail.com
f12301d51a Fixed some runtimes. 
Virus2 has been effectively removed from the code as it was not actually used and was causing some runtimes.
The PA is now properly affected by meteors/blobs/bombs.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2903 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-02 22:12:36 +00:00
Tastyfish
3c15526e3f accidentally called the wrong unequip proc, they're all so similar! 2012-01-02 12:52:09 -05:00
Tastyfish
4de9164a5b Merge remote-tracking branch 'upstream/master' 2012-01-02 11:47:20 -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
Tastyfish
024120e4a3 Merge pull request #193 from Abi79/master 
TG conveyor2 update
 2012-01-02 06:37:53 -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
32492a51fe fixed edit-appearence to assign hair and facial style correctly. somehow I didn't notice it wasn't changing in testing :p 2012-01-02 06:33:59 -05:00
Tastyfish
1feb16439e can get out of straight jacket after 4 byond minutes now (better than infinity) 2012-01-02 04:54:19 -05:00
VivianFoxfoot@gmail.com
bf56fc6e99 Doors no longer close if there is a mob in the tile, a door can be hacked/AI overriden to close anyways and injure that mob as well as knock them down so they can be crushed again and again until they stop moving. (Currently: 35 brute and knockdown.) 
The server master log now records attacks / emotes / PDA messages, as well as timestamping.  

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2899 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-02 08:42:44 +00:00
quartz235@gmail.com
e0b19c9ce3 Fixed issue 287, 290, 291 
-Cutting/restoring cameras now leaves a print
-building certain overly-abused griff items leaves prints
-grenade launcher no longer shoots your face if you try to backpack it

Chameleon projector movement speed is now based on temperature
Added add_hiddenprint(mob) proc
it's like add_fingerprint but only adds to fingerprintshidden isn't that neat?

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2898 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-02 07:57:37 +00:00
Tastyfish
00a86accfa Merge pull request #188 from caelaislinn/master 
Antiqua changes + first official contribution :3
 2012-01-01 23:53:29 -08:00
Tastyfish
6cf377a25d Merge remote-tracking branch 'cael/master' 2012-01-02 02:30:41 -05:00
SkyMarshal
15d2f06762 pAI's in PDA's can now hear things, hypothetically. 2012-01-02 00:23:43 -07:00
CaelAislinn
c6fda41758 tweaked cargo bay conveyors 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 17:04:18 +10:00
SkyMarshal
b30da1fa98 Some fixes and improvements. 2012-01-01 22:29:04 -07:00