cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,738 Commits 10 Branches 0 Tags
070cb50f8df7cc68c2286f56dab414f0ead33cf1
Commit Graph

10293 Commits

Author SHA1 Message Date
Erthilo
070cb50f8d PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too. 2013-08-11 17:13:58 +01:00
Zuhayr
29ad858ed4 Fixes the weird inertia behavior of cuffed/dragged people in space. 2013-08-11 23:52:46 -07:00
Mloc
7e00df0a56 Merge pull request #3473 from Zuhayr/master 
Commented out gold slime core reactions.
 2013-08-11 06:34:38 -07:00
Segrain
935a7f30ea Typo fix. 2013-08-11 09:22:20 +03:00
Zuhayr
2ce91a3fbc Commented out gold slime core reactions. 2013-08-10 18:19:41 -07:00
Zuhayr
cfc7dc73d9 Merge pull request #3465 from DJSnapshot/new_player 
Changes to new_player.dm
 2013-08-08 16:08:31 -07:00
DJSnapshot
0feea48cf8 Changed observe button warning to reflect 30 minute wait time. 2013-08-08 14:32:44 -07:00
Jim "Apples"
a3c4f43e82 Merge pull request #3459 from Mloc/probfix 
Fix for autotraitor not working in secret probabilities.
 2013-08-07 09:00:51 -07:00
Mloc-Argent
941f36ddec Fix for autotraitor not working in secret probabilities. All modes default to 0 prob in secret now. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-07 16:56:41 +01:00
Segrain
858d6d8131 Tape is not a lattice. 2013-08-07 02:56:21 +03:00
Segrain
81c8478e74 Fix for #3450. Also, stuff. 2013-08-07 00:50:46 +03:00
Akai Alonkai
2db7beb19c Removed Z-up function from Client/Center() 
Turns out this was allowing mecha to travel semi-unrestricted upwards
through z-levels, including to Central Command and the Away Mission.
 2013-08-06 10:46:23 -04:00
Mloc-Argent
dd303f9f82 Fixes for virology machinery. 
Browser UI properly updates on click and on process()
Dishincubator now properly removes radiation (again)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-06 11:59:50 +01:00
Segrain
0a4e4310fd Fix for #3432. 2013-08-06 01:32:34 +03:00
Segrain
170c66ee8a Fix for ERT spawning. 2013-08-06 01:30:49 +03:00
Zuhayr
9176d56b56 Merge pull request #3434 from Mloc/master 
Made IRCbot's password and host a config option.
 2013-08-05 14:19:00 -07:00
Mloc-Argent
9a5a1dc82c Made IRCbot's password and host a config option. 
Added a hook to send a message to the bot when a round starts.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-05 14:07:06 +01:00
Segrain
440b37dcf4 Fix for #3430. 2013-08-05 03:06:31 +03:00
comma
e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm
 2013-08-04 01:40:32 +04:00
Mloc
0091294204 Merge pull request #3418 from comma/dev-freeze 
Fixed monkeys not getting space rabies via syringes.
 2013-08-03 14:08:57 -07:00
comma
747c71096e Fixed monkeys not getting space rabies via syringes. 2013-08-04 00:32:37 +04:00
Alex
35e7ec3228 Allow cyborgs to hack vending machines 2013-08-03 14:08:27 +02:00
Segrain
d21a29dc09 Runtime error fix. 2013-08-02 19:09:54 +03:00
Segrain
c2712dd9d3 Fix for #3410. 2013-08-01 20:58:35 +03:00
Segrain
fb4552f394 Fix for #3383. Again. 2013-08-01 17:15:16 +03:00
Segrain
2e2cca058c Fix for #3406. 2013-08-01 17:11:12 +03:00
Segrain
8021250804 Type mismatch fix. 2013-07-31 10:32:19 +03:00
Erthilo
89ffc92168 Fixes text errors in ghost manifest runes and newscasters with apostrophes. 2013-07-30 22:36:42 +01:00
Erthilo
d591c1ef75 Hotfix for EFTPOS and ATM machines not connecting to databases. 2013-07-30 20:26:08 +01:00
Erthilo
9bbf43407f Fixes Gravitational Catapult not detaching. 2013-07-30 20:06:37 +01:00
Segrain
24bc26fd13 Fix for table/computer cross-detection. 2013-07-30 19:13:42 +03:00
Segrain
578a020c8b Fix for #3392. 2013-07-30 12:15:12 +03:00
Chinsky
27c1bced7f Merge pull request #3385 from Zuhayr/master 
Taser runtime fix.
 2013-07-29 12:13:22 -07:00
Zuhayr
a39aff3471 Removed a very very redundant check in the ablative armour code. Thanks Segrain. 2013-07-29 12:51:20 -07:00
Zuhayr
5adc32cf8e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-29 12:15:23 -07:00
Zuhayr
b1ac1d58f9 Fixes #3383 2013-07-29 12:15:04 -07:00
meyar
1498c5748e Camera's got lost in the shuffle. 2013-07-29 04:34:28 -04:00
meyar
de0c032486 Turns two ERT files into one. Also fixes the ERT admin button being bork. 2013-07-29 03:45:49 -04:00
Segrain
ea320dca67 Conflict fix? 2013-07-29 08:15:54 +03:00
Segrain
da2786891a Fix for #3337. 2013-07-29 08:12:02 +03:00
Zuhayr
ea9078830a Merge pull request #3384 from SkyMarshal/airfixes 
Fixes a bug with heat transfer.
 2013-07-28 19:13:13 -07:00
SkyMarshal
cd72596249 Fixes a bug with heat transfer. 2013-07-28 19:11:05 -07:00
Segrain
fdce68fe66 Magboots fix. 2013-07-28 14:31:23 +03:00
Zuhayr
1670ed8051 Fixes sprite reset issue for cyborgs, adds combat sprite to Secborg sprite choices. 2013-07-27 01:08:27 -07:00
Zuhayr
37aef47198 Nerfed the combat borg. Laser instead of cannon, cannon instead of plasma rifle. Added red alert check to crisis mode. 2013-07-27 00:48:50 -07:00
Zuhayr
c09d07bb82 Added tool steps to manually remove the bolts on a deployed nuclear weapon. 2013-07-27 00:09:19 -07:00
SkyMarshal
72c331bfa7 Several ZAS fixes. 
Adds insulation to doors, modifiable by admins from the ZAS setting panel.
Fixes a logic error with connections.  (I am dumb some days)
Improves the runtime detection and reporting.
Improves "zone info" debug verb.
 2013-07-25 21:34:12 -07:00
Zuhayr
8124f7bfe7 Merge pull request #3352 from Mloc/zasfixes 
ZAS fix.  It should now be possible to repair breaches without admin int...
 2013-07-25 06:40:21 -07:00
Mloc-Argent
d02d50d0ce ZAS fix. It should now be possible to repair breaches without admin intervention. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-25 14:31:31 +01:00
Segrain
cf4f9ba054 Typo fix, retractor step bugfix. 2013-07-25 03:06:06 +03:00