dbf4c84953
Merge pull request #311 from Markolie/master
...
Ziptie restraint examine, fax panel adjustment
2015-02-14 23:23:35 -05:00
0792a40379
Add zipties to secvender, replace box of handcuffs in warden's locker with zipties box
2015-02-14 22:31:31 +01:00
ba63ce5092
Add pay button to vendors
2015-02-14 19:07:00 +01:00
d3256723c4
Merge pull request #310 from Markolie/master
...
Fix viro maint access, other fixes
2015-02-14 11:26:22 -05:00
f019d32fbe
Fix MegaSeed vendor seed names on roundstart
2015-02-14 16:55:17 +01:00
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
9fed8135d4
Handcuff refactor, IV drip fix
2015-02-14 04:35:32 +01:00
9dd99ba240
Stop AI's from detaching IV drips, Ultimate Chimera's alien AI fix
2015-02-14 00:18:41 +01:00
f180812abb
Ensure interface updates on emag
2015-02-13 17:14:20 +01:00
c8acddaad3
Windowdoor emag fix
2015-02-13 17:12:21 +01:00
0b937d5ace
Emag refactor
2015-02-13 16:59:20 +01:00
71319538df
Vending machine overhaul, teleporter area fix, add events to status tab
2015-02-13 15:27:42 +01:00
91def7da63
Fix meter
2015-02-13 14:25:54 +01:00
66d3bfccf6
Merge pull request #304 from Markolie/master
...
Get_candidates simplification, antag age adjustment, fixes
2015-02-12 20:26:02 -05:00
8144cf030c
Fix toy exploit
2015-02-13 01:49:27 +01:00
6101becbe4
Merge pull request #305 from FalseIncarnate/master
...
[Bug-Fix] Re-adds missing seeds, floodlight wrenching
2015-02-13 00:24:41 +01:00
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
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
a4cda9287f
Merge with upstream/master
2015-02-12 16:43:01 -05:00
8b35ce23ae
Merge pull request #300 from Artorp/cryoUI
...
Added UI to cryo autoeject feature
2015-02-12 21:38:29 +01:00
747ef23162
Merge pull request #299 from Artorp/canisterUI
...
Canister label system UI
2015-02-12 21:37:10 +01:00
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
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
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
4e2694cc03
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-02-12 19:11:35 +01:00
3f80f66411
Simplify get_candidates, minor adjustment to antag ages
2015-02-12 19:09:05 +01:00
cee11d4718
Attack log some cyborg killswitch stuff
2015-02-12 03:06:59 -05:00
d0d000160b
And even moar nade logging from adminlog to attacklog
2015-02-12 02:44:28 -05:00
1c38527684
Added UI to cryo autoeject feature
2015-02-12 00:23:13 +01:00
7e4e3acedc
Added UI for new canister label system
2015-02-11 23:19:46 +01:00
68772fd8f9
Merge pull request #295 from Markolie/master
...
Revert camera caching
2015-02-11 16:53:05 -05:00
2250aeddff
Revert camera caching
2015-02-11 16:11:32 +01:00
c2f84b67f0
Merge pull request #279 from Markolie/master
...
[BUGFIX] Add report_alerts variable to areas, zeroth law fix, cameranet code update
2015-02-10 21:35:30 -05:00
80112d8dec
Fix canister N2O sprite
2015-02-11 00:20:50 +01:00
b3a0c9a975
Removes TABLEPASS and FPRINT flags
...
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
b977a74acb
Merge pull request #290 from PJB3005/Canisters!
...
canisters fix #2
2015-02-10 16:14:47 -05:00
adf656f850
Merge pull request #271 from Svej/lapcharger
...
[FEATURE] Laptop Recharger + Changelog button
2015-02-10 15:57:50 -05:00
f14b5ee7a5
UGH
...
I HATE YOU BYOND
2015-02-10 21:44:30 +01:00
97b75276fa
Fix robot tracking
2015-02-10 17:26:35 +01:00
64fe9e8600
Remove legacy viewpoint code, move back to Bay's and /tg/'s system
2015-02-10 17:02:27 +01:00
c507158b8f
Camera code update, fix runtime
2015-02-10 15:42:47 +01:00
26d0de51bb
Add report_alerts variable to areas
2015-02-10 02:07:02 +01:00
2e57ef5f01
Merge pull request #272 from Markolie/master
...
[FEATURE][REFACTOR] Accessory changes, R&D search function
2015-02-09 18:14:58 -05:00
7cb213b1cd
Merge pull request #274 from PJB3005/Canisters!
...
N2O sprite hotifx
2015-02-09 13:55:40 -05:00
c2058c4a9d
Update our /Topic code to prevent exploits
2015-02-09 18:22:22 +01:00
28bc45ce04
Craaaaaa..
...
P
2015-02-09 17:47:54 +01:00
6bd247dd40
[FEATURE] Laptop Recharger + Changelog button
...
1. Adds in a Laptop Recharger that can only recharge laptops. Could
potentially be placed near the latop vendor, and the detectives office.
2. The changelog button now links to Github instead of the outdated
forum changelog
2015-02-09 16:40:52 +01:00
bec9a7720e
Runtime fix
2015-02-09 16:20:39 +01:00
354e569f9d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/machinery/rechargestation.dm
2015-02-09 16:15:00 +01:00
7285f39fc1
Defib update, cell path update
2015-02-09 16:12:01 +01:00
Fox-McCloud