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
cib
a902744264 A new breakthrough in quantum technology now allows you to convert energy to mass directly using the chem dispenser. Enabling this feature requires huge amounts of power, however. 2011-12-28 19:45:43 -08:00
rockdtben
a2b7cedd34 -Fixed a bug that caused insta oxycrit. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2841 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-28 19:05:27 +00:00
baloh.matevz
19fb811e20 Patched up the three major security risks in engineering: the north CE window facing the hallway, the north engineering window facing the hallway, the regular wall in the smes room. 
Fixed a problem where all the engine parts that the QM ordered would start in stage 4 of construction and anchored...

Added a few fire alarms to engineering

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2840 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-28 18:38:08 +00:00
heisen51@gmail.com
9c70500367 Fixed a missing disposal pipe section and APC in Fore Starboard Maintenance 
Wrapped objects can now be labelled with a pen
Wrapped small packages can be picked up, and are now opened by being used on themselves.
Added a new disposal pipe part: The wrapsortjunction diverts disposalholders with a tomail value of 1. Disposalholders are given a tomail value of 1 only if they originate from a disposal unit with a package in it.
Package wrappers are now w_class = 4.0. This is to prevent bugs when wrapping containers.
Mail office remapped such that packages flushed down disposals end up on a special table.
Package wrappers placed in most of the station departments. Some of these may be removed in the future if unneeded.
Changelog updated accordingly.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2838 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-28 14:56:09 +00:00
Tastyfish
6e95fc4f1d better yet, let both apc module and disposal circuit be creatable in autolathe 2011-12-28 06:12:21 -05:00
Tastyfish
83ce12e7c3 disposal destructable, can develop disposal circuits now 2011-12-28 05:53:49 -05:00
quartz235@gmail.com
9b062f7f77 Trial administrators can now toggle adminhelp sound when set-observe['d 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2837 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-28 09:44:19 +00:00
Albert Iordache
83f5e93768 Merge pull request #161 from SkyMarshal/master 
Added air pressure define for disposals, minor map edit, removed Deathgasp from emotes.
 2011-12-28 00:57:37 -08:00
SkyMarshal
28752b4410 Added disposals to detective's office, fixed more code. 2011-12-27 22:38:14 -07:00
SkyMarshal
a23024e211 Small map edit, reduced amount of air needed for disposals. 2011-12-27 21:13:12 -07:00
Tastyfish
f378644bb0 constructable/destroyable lights! 2011-12-27 22:13:18 -05:00
quartz235@gmail.com
706c20a15e Atmos techs now spawn with extended capacity emergency tanks 
AIs/Cyborgs can no longer drink from the toilet or wash themselves in sinks for the good of IMMERSION

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2836 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-28 02:08:33 +00:00
Tastyfish
0e222e838f replaced "toggle pregame music" with button in pregame screen that saves between games 2011-12-27 19:53:02 -05:00
SkyMarshal
aac7a104eb More amusing message. 2011-12-27 14:32:05 -07:00
SkyMarshal
03445062c4 Reworked pepperspray's results 2011-12-27 14:26:08 -07:00
SkyMarshal
25400f7af4 Should be the rest for this lot. 2011-12-27 14:13:11 -07:00
SkyMarshal
e32813060f Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-27 13:45:15 -07:00
cib
9d97e99017 Made vira more likely to infect you. Removed vira from the medical HUD. Added the symptoms: Stumble, hoarse throat, and whisper. Added a random virus dishes to virology. 2011-12-27 21:12:01 -08:00
SkyMarshal
08ff9b06e7 Fixed several things. 2011-12-27 13:44:52 -07:00
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
08a9f11d39 Merge pull request #154 from CIB/master 
New virology
 2011-12-27 04:59:59 -08: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
heisen51@gmail.com
8295264dc5 Being in a freezer crate or refrigerator now has the same effect on meat as 0C air. 
Kitchen cold room tweaked a bit more.
Cold room added to Uterus.

Changelog updated to indicate new freezer crate/refrigerator functionality.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2832 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-27 11:46:15 +00:00
petethegoat@gmail.com
b9c3f9ce65 Added Scottzar's emitter projectile sprite. Thanks! 
Fixed some issues with paper.
Slightly adjusted the atmospheric door sprites.
Added some SMES assembly sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2829 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-27 04:19:18 +00: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
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
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
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
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
rockdtben
406d2eed23 Removing some references and replacing with the god procs. oxyloss mostly this time. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2823 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 17:56:22 +00:00
baloh.matevz
fa5a5772c8 Engineering remapped 
Screenshot: http://www.kamletos.si/new%20engineering2.png

Added glass doors to the table facing the hallway after that screenshot was made

- Added an emp-proof camera for singularity viewing
- Particle accelerator now starts set up

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2820 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 17:11:12 +00:00
Tastyfish
03b8be52fa capitalize first letter of says and whispers like old bs12 2011-12-26 12:02:57 -05:00
ryantennessee@yahoo.com
645ceae251 Second installment of fullbeakers. Contains all complex chemicals that can be created by mixing base chemcials as well as tox and sleep tox. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2819 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 16:29:36 +00: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
heisen51@gmail.com
10da4a1304 Unsecured disposal pipes are now density=0, so you can walk over them. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2818 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 15:44:08 +00:00
Albert Iordache
87941b7081 Merge pull request #146 from SkyMarshal/master 
Check that description.
 2011-12-26 07:21:52 -08:00
Tastyfish
5e2408149d Merge remote-tracking branch 'upstream/master' 2011-12-26 06:03:47 -05:00