Commit Graph

14973 Commits

Author SHA1 Message Date
ZomgPonies
03a08e931a Fixes problem with sound toggles. 2015-02-17 04:55:18 -05:00
Mark van Alphen
5dad7fa58d Merge pull request #316 from ZomgPonies/rev
Rev Tuning
2015-02-16 19:27:04 +01:00
ZomgPonies
2894dbc266 Removed IAA from target list. 2015-02-16 13:09:47 -05:00
Mark van Alphen
2415f92cbc Merge pull request #320 from ZomgPonies/master
Additional karma check to prevent potential exploit?
2015-02-16 15:15:27 +01:00
ZomgPonies
6c1a629882 Additional karma check to prevent potential exploit? 2015-02-16 06:14:06 -05:00
Mark van Alphen
3bc771b15b Merge pull request #314 from Fox-McCloud/Cargo
Cargo
2015-02-16 06:52:16 +01:00
ZomgPonies
66be012a9c Fixes attacklog toggle not saving accross rounds 2015-02-15 12:23:21 -05:00
ZomgPonies
3193e06afc Adds extra targets if there's more than 40 readied players at roundstart. 2015-02-15 09:26:16 -05:00
Artorp
839ac9e026 Moves plasma decal from N2 tank to plasma tank 2015-02-15 09:54:07 +01:00
Fox-McCloud
1fdd281f19 Critter Crate Fix 2015-02-15 03:19:43 -05:00
Fox-McCloud
dbf4c84953 Merge pull request #311 from Markolie/master
Ziptie restraint examine, fax panel adjustment
2015-02-14 23:23:35 -05:00
Fox-McCloud
a21f5f5048 Fix 2015-02-14 22:04:19 -05:00
Fox-McCloud
1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00
Fox-McCloud
0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
Markolie
0792a40379 Add zipties to secvender, replace box of handcuffs in warden's locker with zipties box 2015-02-14 22:31:31 +01:00
Markolie
49d8ab165a Turn chemistry dispenser beaker in overlay so the constructable dispenser has one 2015-02-14 21:34:14 +01:00
Markolie
ba63ce5092 Add pay button to vendors 2015-02-14 19:07:00 +01:00
Markolie
0f64c056bd Fax reply fix 2015-02-14 18:48:20 +01:00
Markolie
85781b8d4c Indent fix 2015-02-14 18:09:35 +01:00
Markolie
f175000ceb Custom fax name check 2015-02-14 18:06:44 +01:00
Markolie
56817e7d0a Ziptie restraint examine 2015-02-14 17:31:56 +01:00
ZomgPonies
d3256723c4 Merge pull request #310 from Markolie/master
Fix viro maint access, other fixes
2015-02-14 11:26:22 -05:00
Markolie
cbc8be2b4f Fax stamp update 2015-02-14 17:20:18 +01:00
Markolie
f019d32fbe Fix MegaSeed vendor seed names on roundstart 2015-02-14 16:55:17 +01:00
ZomgPonies
091d2c8348 Merge pull request #307 from Markolie/master
Fix atmos meter, emag refactor, vending machine update, UI reworks, admin fax overhaul, other fixes
2015-02-14 09:17:52 -05:00
Markolie
165f8118af Add box of zipties, give zipties to nuke ops and Vox raiders 2015-02-14 14:54:32 +01:00
Markolie
47e4126277 Add send time to fax, fix nest issue 2015-02-14 04:56:09 +01:00
Markolie
9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Markolie
e15975e008 Fix typo 2015-02-14 01:32:38 +01:00
Markolie
9dd99ba240 Stop AI's from detaching IV drips, Ultimate Chimera's alien AI fix 2015-02-14 00:18:41 +01:00
Markolie
5fdabeda13 Minor R&D search function fix 2015-02-13 23:28:09 +01:00
Tigercat2000
113fd94e88 Fix dressers to actually work. [BUGFIX] 2015-02-13 23:04:04 +01:00
Markolie
61e9fe3b28 Admin fax overhaul 2015-02-13 20:46:19 +01:00
Markolie
f180812abb Ensure interface updates on emag 2015-02-13 17:14:20 +01:00
Markolie
c8acddaad3 Windowdoor emag fix 2015-02-13 17:12:21 +01:00
Markolie
0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
Markolie
e7713a4662 Fax UI rework 2015-02-13 15:40:53 +01:00
Markolie
71319538df Vending machine overhaul, teleporter area fix, add events to status tab 2015-02-13 15:27:42 +01:00
Markolie
91def7da63 Fix meter 2015-02-13 14:25:54 +01:00
Fox-McCloud
66d3bfccf6 Merge pull request #304 from Markolie/master
Get_candidates simplification, antag age adjustment, fixes
2015-02-12 20:26:02 -05:00
Markolie
8144cf030c Fix toy exploit 2015-02-13 01:49:27 +01:00
Markolie
eb71439e7f Dodgeball 2015-02-13 01:28:55 +01:00
Markolie
8ebc090480 Fix vampire oversight 2015-02-13 01:13:09 +01:00
Markolie
493be57db3 Update one click antag panel 2015-02-13 01:12:41 +01:00
Mark van Alphen
6101becbe4 Merge pull request #305 from FalseIncarnate/master
[Bug-Fix] Re-adds missing seeds, floodlight wrenching
2015-02-13 00:24:41 +01:00
Markolie
f2b09b025f Fix silicon camera 2015-02-13 00:13:52 +01:00
FalseIncarnate
86d069eb31 Floodlight Wrenching
Allows floodlights to be wrenched into place like the carts, to avoid
accidentally pushing them away.
2015-02-12 18:01:57 -05:00
FalseIncarnate
47b6c867c9 Re-adds Seeds to Vending Machine
Re-adds Tobacco, Coffee Arabica, and Tea Aspera seeds to the seed
vendors. They were accidentally removed in the Econ revert.
2015-02-12 18:00:59 -05:00
Markolie
6938ad7edc False rwalls now smooth with regular walls and vice versa 2015-02-12 23:37:54 +01:00
Mark van Alphen
8b35ce23ae Merge pull request #300 from Artorp/cryoUI
Added UI to cryo autoeject feature
2015-02-12 21:38:29 +01:00