Markolie
672305e034
Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things
2015-02-22 22:12:11 +01:00
Markolie
377dfe894d
Add attack animations
2015-02-22 21:15:54 +01:00
Markolie
72db213067
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/jobs/job/support.dm
code/setup.dm
2015-02-22 19:12:11 +01:00
Markolie
982102a407
Standardize mutations
2015-02-22 19:04:43 +01:00
Markolie
3b072b5a62
Remove click delay from most things
2015-02-22 18:47:58 +01:00
ZomgPonies
1f5ef8d4dd
Merge pull request #380 from Markolie/master
...
Adds celsius to the freezer/heater, crafting update
2015-02-22 08:30:11 -05:00
ZomgPonies
1c1ebc3f3f
Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits
...
Syndi hardsuits
2015-02-22 08:27:38 -05:00
Markolie
6d54e142eb
Update ghetto bomb explosion
2015-02-22 05:45:22 +01:00
Fox-McCloud
4b74e209b5
Medical Stacks
2015-02-21 21:34:58 -05:00
Markolie
efb45ea228
Table crafting refactor
2015-02-22 01:50:57 +01:00
Fox-McCloud
2a1028324c
Thickmaterial Flag
2015-02-21 07:26:25 -05:00
ZomgPonies
07cdcb3cff
Merge pull request #367 from Markolie/master
...
Switch copytext and sanitize proc
2015-02-20 16:22:32 -05:00
Markolie
9fedfc7c62
Switch copytext and sanitize proc
2015-02-20 22:17:13 +01:00
Artorp
ef2c939872
Change space law iframe wiki link
2015-02-20 19:20:21 +01:00
Markolie
c89e3ac1eb
Revert "Revert "Emergency communications hotfix""
...
This reverts commit 3ea36839a8
2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
Fox-McCloud
be2e754706
Syndicate Rebalance
2015-02-20 03:14:12 -05:00
DZD
8193c0ab8e
Makes things compile
2015-02-19 20:47:57 -05:00
DZD
212ca5f5bd
MERGE CONFLIIIIIICTS
2015-02-19 20:26:36 -05:00
ZomgPonies
d54579850c
Revert "Saycode/language/species port from Bay"
2015-02-19 20:15:42 -05:00
DZD
d0d6c8eebd
Merge with upstream/master
...
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
ZomgPonies
043a5e0e31
Merge pull request #331 from Markolie/master
...
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
Markolie
46c53be6f1
Part 2 of saycode/language/species port from Bay. Also includes bugfixes.
2015-02-20 00:50:28 +01:00
DZD
a299793ab8
Makes code compile again
...
Fixing merge conflicts had the sideffect of adding one instance of
canremove, and one of drop_from_inventory.
2015-02-18 13:50:36 -05:00
DZD
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD
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
Mark van Alphen
87ed05c146
Merge pull request #326 from Artorp/AutolatheQueue
...
Added queue functionality to the autolathe
2015-02-18 16:16:05 +01:00
ZomgPonies
97f80d0f5b
Merge pull request #323 from Fox-McCloud/Sounds
...
Sounds
2015-02-17 18:44:54 -05:00
Markolie
21926c9e48
Part 1 of saycode/language/species port from Bay
2015-02-17 23:20:50 +01:00
Artorp
e1eb2b9a1d
Updated m_amt and g_amt to match their design
2015-02-17 18:52:31 +01:00
Markolie
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
Markolie
d7f17f6eba
Bug fixes, give roboticist toolbelt, AI recall shuttle option
2015-02-17 01:04:04 +01:00
Markolie
4d8481f83a
Merge surgical borgs and crisis borgs
2015-02-16 22:47:55 +01:00
Fox-McCloud
a03879d83f
Sound Updates
2015-02-16 16:29:43 -05:00
Markolie
8726bad5b0
Z-level check refactor
2015-02-16 20:33:28 +01:00
Markolie
ad167dc541
Announcement system overhaul, crew monitor system overhaul, add portable crew monitor
2015-02-16 19:03:29 +01: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
165f8118af
Add box of zipties, give zipties to nuke ops and Vox raiders
2015-02-14 14:54:32 +01:00
Markolie
9fed8135d4
Handcuff refactor, IV drip fix
2015-02-14 04:35:32 +01:00
Markolie
0b937d5ace
Emag refactor
2015-02-13 16:59:20 +01:00
DZD
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
DZD
a4cda9287f
Merge with upstream/master
2015-02-12 16:43:01 -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
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
Fox-McCloud
c78368a3e8
Merge pull request #281 from ZomgPonies/master
...
[BALANCE][BUGFIX] Singuloth Knight item balance & Small Bugfixes
2015-02-10 21:35:48 -05:00
Fox-McCloud
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
DZD
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
