Commit Graph

14949 Commits

Author SHA1 Message Date
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
Mark van Alphen
747ef23162 Merge pull request #299 from Artorp/canisterUI
Canister label system UI
2015-02-12 21:37:10 +01:00
Artorp
dfe10dcaa8 Decals scalability, templ exploit prevention
- Moved from multiple if() to for(), adding scalability to decals

- added is_a_decal() to prevent possible template mod exploits
2015-02-12 20:58:41 +01:00
Artorp
8aed91a98f Prevents template modification exploits
Adds a check, if the value provided by the template isn't in the
possible color list it won't be used.
2015-02-12 20:19:31 +01:00
Artorp
b4b7e9b6fd Canister flag fixes, name sanitization
- Fixes update_flag to proper behavior

- Removed duplicate cases of update_icon()

- Adds text sanitazion, limits text length to name limit
2015-02-12 19:56:05 +01:00
Markolie
4e2694cc03 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-12 19:11:35 +01:00
Markolie
3f80f66411 Simplify get_candidates, minor adjustment to antag ages 2015-02-12 19:09:05 +01:00
Mark van Alphen
911638c524 Merge pull request #302 from ZomgPonies/attacklog
Moving stuff from Adminlog to Attacklog to simplify investigations by regularmins.
2015-02-12 10:44:52 +01:00
ZomgPonies
cee11d4718 Attack log some cyborg killswitch stuff 2015-02-12 03:06:59 -05:00
ZomgPonies
d0d000160b And even moar nade logging from adminlog to attacklog 2015-02-12 02:44:28 -05:00
ZomgPonies
6cf4852a60 More nade logging from adminlog to attacklog 2015-02-12 02:41:33 -05:00
ZomgPonies
fea89953f1 Moved emitter deletions from adminlog to attacklog 2015-02-12 02:21:23 -05:00
ZomgPonies
453b23961d Moved singulo logging from adminlog to attacklog 2015-02-12 02:17:48 -05:00
ZomgPonies
e9b413b1ff Moved broken/deanchored window logging from adminlog to attacklog 2015-02-12 02:16:55 -05:00
ZomgPonies
a3716dbea4 Moved fueltankbomb logging from adminlong to attacklog 2015-02-12 02:06:44 -05:00
ZomgPonies
4d2ccff974 Moved bomb logging from adminlog to attacklog 2015-02-12 02:04:32 -05:00
ZomgPonies
239c996b1c Moved grenade logging from adminlog to attacklog 2015-02-12 01:58:34 -05:00
ZomgPonies
7cf86e2cfe Fixes light going through walls. 2015-02-12 01:23:16 -05:00
Artorp
1c38527684 Added UI to cryo autoeject feature 2015-02-12 00:23:13 +01:00
ZomgPonies
20637ad9c9 Merge pull request #298 from TheDZD/changeling
Changelinging/Objective Fixes [BUGFIX]
2015-02-11 17:41:18 -05:00
DZD
017c63dfa2 Fixes
- Fixes #294, #296.
- Purges use of 2 instead of DEAD when checking for stat in objective.dm
2015-02-11 17:20:22 -05:00
Artorp
7e4e3acedc Added UI for new canister label system 2015-02-11 23:19:46 +01:00
Fox-McCloud
dbd2063561 Merge pull request #286 from FalseIncarnate/master
[Feature] Food Carts
2015-02-11 16:53:55 -05:00
Fox-McCloud
68772fd8f9 Merge pull request #295 from Markolie/master
Revert camera caching
2015-02-11 16:53:05 -05:00
Markolie
2250aeddff Revert camera caching 2015-02-11 16:11:32 +01:00