Commit Graph

9733 Commits

Author SHA1 Message Date
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
d_h2005@yahoo.com
68969baa5c Fixes issue 1106 - Splits the chicken suit into suit and hat. Adds an egg to the costume landmark for honks and giggles.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5359 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-19 06:36:12 +00:00
giacomand@gmail.com
7b3ca4e0d9 Reverted r5355.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5357 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-18 23:51:10 +00:00
ericgfwong@hotmail.com
4ca1f32713 Increased the probability of tricord's effectiveness from 40% to 80%
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5356 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-18 21:05:20 +00:00
giacomand@gmail.com
452a241251 -Summoning Nar-Sie will be the only objective of cultists.
-You can only summon Nar-Sie on the station Z level. Added more text to explain this.

This commit has been approved by the people of coderbus.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5355 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-18 20:31:55 +00:00
cib
f769bcffb3 Fixed an indentation error. 2012-12-18 18:40:55 +01:00
cib
9427c963cb Spacesuits and helmets now protect from pressure.
Don't want to know why they didn't before.
2012-12-18 18:36:54 +01:00
cib
9a6cc83f48 Made the cleaver be a sharp weapon, so you can decapicate with it. 2012-12-18 18:10:28 +01:00
cib
85ec5157fe Forced antags are now logged to admins.
This might help tell bugs from simply no one having chosen the role.
2012-12-18 17:25:14 +01:00
Hawk-v3
7c43c3d1a6 Merge pull request #2082 from Zuhayr/master
Fix for stun baton throwing message.
2012-12-18 08:13:45 -08:00
Zuhayr
24473bdd19 A small fix to the throwing string when a mob is struck with a baton. 2012-12-19 01:57:47 -08:00
cib
59ed460c65 Fix a compile error. 2012-12-18 15:56:24 +01:00
RavingManiac
1b756b9fe5 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-18 22:01:51 +08:00
Jim "Apples"
70a82fcde6 Merge pull request #2080 from Zuhayr/master
Oen'g's baton (Custom item)
2012-12-18 05:14:23 -08:00
Zuhayr
d59b160f80 Oen'g's baton. 2012-12-19 00:13:19 -08:00
cib
455b0a7c3b Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	code/game/gamemodes/events.dm
2012-12-18 14:08:41 +01:00
Hawk-v3
79b9285889 Merge pull request #2076 from GauHelldragon/master
Telecomm Server circuit label fix
2012-12-18 04:40:43 -08:00
ericgfwong@hotmail.com
beaf10ed6a Medibots now only use Tricordrazine and Spaceacillin for all their treatment-related activities.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5353 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-18 04:22:26 +00:00
ericgfwong@hotmail.com
d8230cbd18 Updated DJ Station instructions
Re-added Old Note
A few more changes to the old assembly line to make it more convincingly derelict.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5352 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-18 02:25:16 +00:00
RavingManiac
67bbd9bf2b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-17 21:11:03 +08:00