2c6d2f07fc
Fix PDA bug
2015-02-20 19:56:57 +01:00
c89e3ac1eb
Revert "Revert "Emergency communications hotfix""
...
This reverts commit 3ea36839a8
2015-02-20 17:59:07 +01:00
d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
826ccaed70
Extra Freeze features- Prevent direct touching and pulling
2015-02-20 05:16:03 +01:00
212ca5f5bd
MERGE CONFLIIIIIICTS
2015-02-19 20:26:36 -05:00
d54579850c
Revert "Saycode/language/species port from Bay"
2015-02-19 20:15:42 -05:00
5cad457f94
Span class fix
2015-02-19 20:01:23 -05:00
d0d6c8eebd
Merge with upstream/master
...
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
c11bb0d283
Fixes bugs
...
- Tables can't have NODROP or ABSTRACT items placed on them anymore,
same for lockers and crates.
- Fixes a runtime with trying to strip a NODROP or ABSTRACT item.
2015-02-19 19:32:58 -05:00
46c53be6f1
Part 2 of saycode/language/species port from Bay. Also includes bugfixes.
2015-02-20 00:50:28 +01:00
dad0b2d856
Fix AI tracking, karma message fix, karma say fix, robot storage sprite change
2015-02-19 01:05:00 +01:00
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
fbd9c367c0
NODROP flag addition & handling
...
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
2adf44e4a1
Borer, pAI and posibrain language fix
2015-02-17 23:36:46 +01:00
12b297219d
Fix AI eye icon
2015-02-17 23:33:32 +01:00
21926c9e48
Part 1 of saycode/language/species port from Bay
2015-02-17 23:20:50 +01:00
f5e2d82953
(Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/machinery/atmoalter/canister.dm
2015-02-17 02:12:22 +01:00
d7f17f6eba
Bug fixes, give roboticist toolbelt, AI recall shuttle option
2015-02-17 01:04:04 +01:00
4d8481f83a
Merge surgical borgs and crisis borgs
2015-02-16 22:47:55 +01:00
95e18fd397
Solar update, convert solar to NanoUI
2015-02-16 21:35:34 +01:00
8726bad5b0
Z-level check refactor
2015-02-16 20:33:28 +01:00
ad167dc541
Announcement system overhaul, crew monitor system overhaul, add portable crew monitor
2015-02-16 19:03:29 +01:00
3bc771b15b
Merge pull request #314 from Fox-McCloud/Cargo
...
Cargo
2015-02-16 06:52:16 +01:00
1e4d1df880
Merge remote-tracking branch 'upstream/master' into Cargo
2015-02-14 22:02:39 -05:00
0de7e1035c
Cargo Supplies
2015-02-14 21:21:09 -05:00
56817e7d0a
Ziptie restraint examine
2015-02-14 17:31:56 +01:00
9fed8135d4
Handcuff refactor, IV drip fix
2015-02-14 04:35:32 +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
493be57db3
Update one click antag panel
2015-02-13 01:12:41 +01:00
723dc2ad98
ABSTRACT flag addition & handling
...
- Adds ABSTRACT flag to relevant items, removes abstract var.
- Adds checks for ABSTRACT where relevant.
- Also removes extra define of golem gas mask.
- Adds NODROP to changeling mutations so I don't have to do that later.
2015-02-12 18:49:26 -05:00
a4cda9287f
Merge with upstream/master
2015-02-12 16:43:01 -05: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
2f965955ad
Merge pull request #288 from TheDZD/changeling
...
Minor Traitor/Ling Tweaks/Fixes [BUGFIX] [BALANCE]
2015-02-10 21:37:15 -05: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
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
a7ab903b4e
And another AI fix
2015-02-10 23:34:17 +01:00
6f6338cea4
Fix AI eye invisibility
2015-02-10 23:30:16 +01:00
76911cc710
Warning fix
2015-02-10 17:30:30 +01:00
97b75276fa
Fix robot tracking
2015-02-10 17:26:35 +01:00
72ef4f38d5
Fixes Runtimes
...
Fixes runtimes with Assume Direct Control from View Vars, and observing
from the main menu. Morgue sprite code is the cause of both runtimes,
and this may break morgue tray sprites.
2015-02-10 11:25:07 -05:00
2291981c15
Rename Fox.dm to fox.dm
...
For some reason this didn't stick
2015-02-10 17:16:32 +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
3a4679bce7
Remove zeroth law with own board
2015-02-10 03:06:43 +01:00
4e93cc5203
Merge with upstream/maser
2015-02-09 18:22:19 -05:00
c2058c4a9d
Update our /Topic code to prevent exploits
2015-02-09 18:22:22 +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
ZomgPonies