cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,126 Commits 5 Branches 0 Tags
5628272bde0235f752765d64ea1462ed9f51a724
Commit Graph

2336 Commits

Author SHA1 Message Date
Albert Iordache
cfbb6eb704 Fixed a few errors. 2011-12-27 18:52:03 +02:00
Albert Iordache
9219a22f14 Merge branch 'master' of https://github.com/SkyMarshal/Baystation12 into Sky 
Conflicts:
	maps/tgstation.2.0.8.dmm
 2011-12-27 17:08:52 +02:00
Albert Iordache
c99ef988b2 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-27 15:00:12 +02:00
Albert Iordache
08a9f11d39 Merge pull request #154 from CIB/master 
New virology
 2011-12-27 04:59:59 -08:00
Albert Iordache
4139004c35 Changed the number of changelings to 1 per 10 playas 2011-12-27 14:56:51 +02:00
Albert Iordache
2092e25983 Merge pull request #147 from Tastyfish/master 
coats, changeling, piano, also admins can delete books, paper/books more robust against dynamic content, custom votes
 2011-12-27 04:26:51 -08:00
SkyMarshal
607db09620 Lotsa stuff. Map update. 2011-12-26 17:59:09 -07:00
CIB
7270012d01 Merge pull request #149 from SkyMarshal/master 
Added holster to detective's suit, fixed some spelling mistakes.
 2011-12-26 15:48:04 -08:00
CIB
e2d698f376 Merge pull request #150 from MisterFox/master 
Retired Admins rank
 2011-12-26 15:47:25 -08:00
Albert Iordache
c6ad5e6255 Fixed the TG update not compiling 2011-12-27 00:41:11 +02:00
petethegoat@gmail.com
20abc3f9ba TG update: Added adorable pod signs! Moved the Sec escape pod a little further out of the evidence room. Turned on some more scrubbers and vents which were starting off. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2692 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-27 00:18:49 +02:00
ryantennessee@yahoo.com
cf6ccb5650 TG update: Fixed some spelling errors in item descriptions. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2688 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-27 00:16:48 +02:00
CIB123@gmail.com
4bc242711c TG update: Ammend to the last commit, a few files were left out. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2687 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-27 00:15:01 +02:00
CIB123@gmail.com
42890a7c4a TG update: Added antibody-based, random symptom virology. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2686 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-27 00:01:02 +02:00
baloh.matevz
1ac1376806 TG update: Fixed the meteors not exploding on impact error. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2685 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:46:05 +02:00
petethegoat@gmail.com
7cc0842cae TG update: minor pipe code issues. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2684 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:45:34 +02:00
uporotiy
ab396f50ac TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2683 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:39:45 +02:00
LastBattaWolf@hotmail.com
158630c86e TG update: removed title music from bar 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2682 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:33:20 +02:00
kortgstation@gmail.com
28bc2896b9 TG update: Lowered the trigger rate on the teleport armour and the teleport radius (from 8 to 6). 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2681 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:32:44 +02:00
Albert Iordache
ef0a9b3632 TG update: Added Reactive Teleport armour and on/off sprites for the armour. Click in hand to toggle on/off (like a cloaking device). When worn and activated, successfully blocked attacks will cause the wearer to warp randomly up to 8 tiles. EMPs will disable it. Values may need tweaking to balance the armour. One set now spawns in the RD's office to it will get used/tested, depending on how that goes I may move it to being produceable by the protolathe only, or remove it entirely etc 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2680 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:30:34 +02:00
Mister Fox
19b8a17557 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-26 14:07:48 -05:00
Mister Fox
30f4e7dea1 Retired Admins rank for retired admins 
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com>
 2011-12-26 13:59:20 -05:00
baloh.matevz
12e851dd3b TG update: Hopefully made meteor mode more deadly. 
Fixed meteor spawning so all the meteors that are set to spawn actually hit, but noticed that 50 meteors every 5 seconds proved itself to be way too laggy when all of them actually spawned properly and aren't deleted at soon as they're created due to being on the map's edge. Instead I lowered it to 6 per second.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2679 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 20:36:57 +02:00
petethegoat@gmail.com
e87ca09537 TG update: Tiny fix for table disassembly. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2677 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 20:34:50 +02:00
Albert Iordache
1fac967212 TG update: Added the (almost finished) displacer. One minor bug with it to work out, does not actually spawn anywhere though so it shouldn't effect anything. Will try to finish it later tonight. 2011-12-26 20:30:45 +02:00
rockdtben
f38a590009 TG update: Removed a proc that does nothing anymore. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2675 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 20:19:12 +02:00
rockdtben
382b6681fd TG update: ... -Removed setBruteLoss and setFireLoss since they served no purpose. -Overrided the proc for get[Fire/Brute]Loss and adjust[Fire/Brute]Loss for humans to use the total damage proc. -Removed redundant checks aka setBruteLoss(max(getBruteLoss(), 0) since the adjust brute proc already prevents it from going negative. -Commented out the UpdateDamage() procs contents as it did nothing. If problems arise we might have to investigate. Soon I will remove the proc entierly. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2673 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 20:14:44 +02:00
baloh.matevz
e76711f587 TG update: Ian can now pull items and bodies that are either dead or unconscious. To stop pulling use the "stop pulling" verb. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2670 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 20:09:55 +02:00
Tastyfish
03b8be52fa capitalize first letter of says and whispers like old bs12 2011-12-26 12:02:57 -05:00
Tastyfish
78ed748eab Merge remote-tracking branch 'upstream/master' 2011-12-26 11:24:39 -05:00
Tastyfish
0e0da0bdbb custom votes 2011-12-26 11:24:28 -05:00
SkyMarshal
b622850145 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-26 09:15:29 -07:00
SkyMarshal
4addb7ddb7 Added holster to the detective's suit, and fixed spelling mistakes on the coat rack. 2011-12-26 09:14:43 -07:00
Albert Iordache
4a8c5e9478 Fixed a minor spelling mistake. 2011-12-26 17:37:04 +02:00
Albert Iordache
87941b7081 Merge pull request #146 from SkyMarshal/master 
Check that description.
 2011-12-26 07:21:52 -08:00
Tastyfish
661888ac11 made paper exploit blocker more robust. i still don't quite want to block images /yet/ 2011-12-26 06:24:13 -05:00
Tastyfish
5e2408149d Merge remote-tracking branch 'upstream/master' 2011-12-26 06:03:47 -05:00
Tastyfish
5f83d846cc added admin verb to delete books 2011-12-26 06:03:31 -05:00
Tastyfish
520ed905cd superficial fix 2011-12-26 05:43:55 -05:00
Tastyfish
57ef5e93a1 fixes to coats 2011-12-26 05:34:34 -05:00
Tastyfish
b0478cde29 can click coats to open their inventory, changlings now 2-3 as per hawk rq, re-did piano :D 2011-12-26 05:11:28 -05:00
cib
0a00281198 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	baystation12.dme
 2011-12-26 01:27:16 -08:00
cib
21876403bb Added new virology to the map. Radium now has a chance of awakening your immune system, but at the same time it has a chance of killing you. Added a dilluted milk recipe, and milk to the chem dispenser. 2011-12-26 01:26:35 -08:00
Albert Iordache
646665bf27 Fixed engineering SMES wiring, made player panel wider. 2011-12-26 10:52:38 +02:00
SkyMarshal
02b456d26e Evidence bags now work for things outside of storage containers. 2011-12-26 00:06:44 -07:00
SkyMarshal
de67b05dce More updates. The evidence bags are kinda borked. 2011-12-26 00:03:05 -07:00
Albert Iordache
77d28802fe Fixed another bug related to the player panel 2011-12-26 01:07:30 +02:00
SkyMarshal
8ee8875e80 Fixed some bugginess with evidence bags. 2011-12-25 12:37:20 -07:00
Albert Iordache
0297084fc2 Fixed runtime error preventing the player panel from opening 2011-12-25 21:30:35 +02:00
Albert Iordache
d2a0fced23 Traitor will now be the default mode in case data/mode.txt get deleted 2011-12-25 20:10:06 +02:00