cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 21:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,588 Commits 9 Branches 0 Tags
c5301c51449fd2ac3cb0d951a201390d62ed00b0
Commit Graph

8886 Commits

Author SHA1 Message Date
cib
d8ab9906f7 Blood transfer rate was too fast, slowed it down. 2012-12-24 19:54:30 +01:00
cib
53e500188b Fixes to the IV drip. 2012-12-24 19:09:45 +01:00
cib
d581ebe767 IV drips now can take blood as well as give it. 
This makes blood donations much easier.
 2012-12-24 18:25:48 +01:00
cib
026bbfa3b7 Implemented ghetto surgery tools. 2012-12-24 18:25:02 +01:00
giacomand@gmail.com
e9fd2037d2 -Committed lpeters's patch which Fixes Issue 1189. http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=11549 
-Made the shower not require power.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5391 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-24 01:38:36 +00:00
baloh.matevz
efe92432e7 - Raised the max temperature fire helmets protect to from 15kK to 30kK. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5390 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-24 00:25:45 +00:00
giacomand@gmail.com
c06fc96acf -Committed something I shouldn't as it wasn't ready and I forgot to untick it while committing my last change. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5389 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-24 00:14:44 +00:00
giacomand@gmail.com
cdc4332769 -Should fix machines not depowering correctly. Let me know if you find a machine which should be powered off but isn't. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5388 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-24 00:12:12 +00:00
baloh.matevz
92a2749fb7 Fixes issue 1111. Makes it possible to apply a manual job ban (via the form in the banning panel) for AI, cyborg, pAI and antagonist roles. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5387 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-23 23:56:08 +00:00
giacomand@gmail.com
ff2133a24e -Uncommented the update_nearby_tiles overriding proc for border_only firedoors. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5385 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-23 21:55:37 +00:00
giacomand@gmail.com
fc86180f6c -The Military PDA will not show up on possible PDAs to message but you can reply to the PDA if it sends a message to you. 
-Changed the exchange rate for plasma to supply points to 2:1
-Admins can now see photos in newscaster channels when using the button in the fun tab.
-Updated changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5383 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-23 20:08:32 +00:00
baloh.matevz
5cebb40123 - Fixed a runtime that happens when you try to add a new admin via the permissions panel. Adding admins through that panel will now work again. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5382 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-23 19:35:20 +00:00
Hawk-v3
aa9207ba44 Merge pull request #2102 from Ravensdale/master 
Station-wide boom sound
 2012-12-23 06:00:41 -08:00
baloh.matevz
b55042e64b - Added temporary jobbans. 
Screenshot: http://www.ss13.eu/tempjobban.PNG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5381 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-23 12:20:11 +00:00
giacomand@gmail.com
a7d2445693 -You can now sell plasma sheets for supply points. Conversion rate is 3 plasma sheets for 1 point. The rate is adjustable. 
-Permission from Erro to remove the "redeem a mech by colllecting all the toys" feature. Removed the description from the mech toys too.
-Fixed a possible exploit with ghost following to create more than one follow loop.
-Re-added send mob to the player panel.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5377 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-23 01:01:25 +00:00
Ravensdale
6a359474cc Update code/game/objects/explosion.dm 
Removing a repeat if statement
 2012-12-22 14:58:01 -08:00
Ravensdale
9d9061180d Port of z-level explosion sound effect from pre-merge. Tested and confirmed working with c-4, welding tanks, meteors and roro explosions, probably more! 2012-12-22 14:46:44 -08:00
Hawk-v3
0917269fe3 Merge pull request #2101 from Ravensdale/master 
Port: Ai cores
 2012-12-22 09:29:53 -08:00
Ravensdale
0ec910729c Porting of old AI cores. Introduces Triumverate, Serithi's TRIBUNAL sprite made public with permission. 2012-12-22 09:25:47 -08:00
baloh.matevz
4ac30972ee Added a fix in IsBanned() that alters the SQL statement based on whether an ip and computer id was passed into the IsBanned() proc. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5374 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-22 17:24:06 +00:00
cib
c354685bd7 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 2012-12-22 17:56:02 +01:00
Hawk-v3
70b40dfc6b Merge pull request #2096 from comma/crates 
Crates
 2012-12-22 08:29:21 -08:00
Hawk-v3
5f77acd30e Merge pull request #2095 from comma/inspace 
Inspace
 2012-12-22 08:27:42 -08:00
Hawk-v3
9df91430fd Merge pull request #2097 from comma/surgery 
Surgery
 2012-12-22 08:27:18 -08:00
Hawk-v3
9e96fa8aca Merge pull request #2099 from Rowtree/master 
Camp Redacted - My map that cib wanted me to upload
 2012-12-22 08:25:15 -08:00
baloh.matevz
77afc4383d Removed some world << "" debug messages from multichoice polls. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5373 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-22 09:56:10 +00:00
cib
767e9f33cf Reduced chemical metabolism and effect of chemicals. 
Most chemicals should now act just as strongly as before, but much more slowly.
 2012-12-22 02:51:40 +01:00
cib
5659e14668 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2012-12-22 02:25:46 +01:00
giacomand@gmail.com
da52e0d847 -Didn't realize atmo_control.dm used a different attackby for a reason. Reverted the changes. 
-Bit more cleaning.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5371 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-21 20:55:49 +00:00
ericgfwong@hotmail.com
e7dc7f9f0e . now works for department radios, in addition to : and # 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5370 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-21 20:44:34 +00:00
giacomand@gmail.com
76a6ef2252 -Cleaned up computers. Fixes Issue 1195 
-Made computers use idle_power_usage and active_power_usage that it used from the MC.

I'm sure something is likely to break because I removed a lot of snowflake code. I tried to test all the computers with what I can but if you find something odd then please tell me.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5369 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-21 20:38:36 +00:00
aranclanos@hotmail.com
ac116cb88d . Fixed the runtime of the holodeck 
If an object gets deleted, it won't be removed from the holodeck list of objects. So the stupid proc will try to do stuff with null. Bad proc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5368 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-21 18:34:20 +00:00
d_h2005@yahoo.com
12e8a32eb2 Tiny adjustment for Ikarrus: The alternate HoS jumpsuit is not a subtype of the normal, and therefore counts towards fulfillment of the Steal objective. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5365 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-21 04:28:11 +00:00
Chinsky
6635fc2a83 Merge branch 'master' into inspace 2012-12-21 01:26:02 +04:00
Chinsky
b3580e8265 Merge branch 'master' into surgery 2012-12-21 01:07:36 +04:00
Chinsky
581f2c4db5 Merge branch 'master' into crates 2012-12-21 01:03:20 +04:00
Hawk-v3
346ffe618f Merge pull request #2087 from CIB/bugfix 
Fixed a bug with EMP's and robolimbs.
 2012-12-20 06:42:54 -08:00
Hawk-v3
a983b72f4d Merge pull request #2085 from GauHelldragon/master 
Various fixes
 2012-12-20 06:42:15 -08:00
ericgfwong@hotmail.com
3a928012f1 Updated Department Security files to work with the new 2.1.0 map. 
Updated the relevant readme file
Updated 2.1.0 with some missing air alarms and fire alarms.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5362 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-20 00:28:13 +00:00
johnsonmt88@gmail.com
17b162d3ba You can now use # to speak over department channels. (#e Hello now works just like :e Hello) 
# was the most voted for symbol, despite it being in different places on british keyboard layouts and every other layout.
The old : symbol still works with department channels.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5361 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-19 23:24:57 +00:00
cib
e0a500377c Fixes dropped cyborg limbs being human. 
Makes them cyborg parts instead.
 2012-12-19 23:30:58 +01:00
cib
2233d0dc8e Fixed a bug with EMP's and robolimbs. 
Light EMP's were much more likely to destroy robolimbs than heavy ones.
 2012-12-19 23:00:01 +01:00
cib
1bdfe2e442 Traitor objectives are now checked regularly. 
This doesn't mean the game can end early, it just means certain traitor objectives get a chance to process themselves before the round ended. For instance, the brig objective can now check periodically how long someone's been in the brig.
 2012-12-19 22:27:15 +01:00
cib
be2466354b Fixed another mistake with projectile dodge code. 2012-12-19 22:03:04 +01:00
GauHelldragon
980a24079f Power draining Anomoly negative charge fix 
fixes issue #2064
 2012-12-19 13:00:30 -08:00
cib
84fe7c01af Fixed two issues with bullet hit chance. 
- Bullet hit chance was too low at close distance
- Missing wouldn't actually prevent the damage
 2012-12-19 21:44:05 +01:00
GauHelldragon
0a5aeb2233 Cane Sprite Fix 
fixes issue #2017
 2012-12-19 12:37:58 -08:00
cib
b0289ce66d Bullets can now also miss, even after entering the same tile. 
This means that aiming for the head with a gun only makes sense from a short distance or when the target is restrained. Otherwise, you're likely to miss unless aiming for the chest.
 2012-12-19 21:20:07 +01:00
cib
596d944414 Added a mechanic that makes it possible to miss in melee. 
Only happens when the target is neither laying nor restrained. In this case, there are various chances to miss the targetted organ, and either hit nothing, or a different organ.
 2012-12-19 20:40:29 +01:00
cib
1d0147c396 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2012-12-19 19:40:28 +01:00