Commit Graph

3054 Commits

Author SHA1 Message Date
Artorp 8f1081a86f Autolathe queue fix
Old oversight, stacks and cost calculation was bugged
2015-02-26 00:41:58 +01:00
Artorp 90e346fef3 Autolathe queue support for stacks
- Processing line (first item in list) will now show stack multiplier
where applicable
- Resources are taken before item is being created, to properly update
the UI
2015-02-26 00:02:13 +01:00
Artorp 99d5a4970b Autolathe queue shows items being processed 2015-02-25 22:23:40 +01:00
Markolie 6efa3bcdaa Fix trays (now bags) 2015-02-25 20:42:43 +01:00
ZomgPonies 8714512403 Superhero Part 2: Owlman vs. The Griffin! 2015-02-24 20:13:00 -05:00
ZomgPonies e9288c614b Merge pull request #388 from Markolie/master
Remove click delay, standardize mutations, attack animations, attackby() params addition
2015-02-23 12:47:25 -05:00
Mark van Alphen 130ed7e18c Merge pull request #381 from Artorp/MimeDoor
Gives the mime his very own door and ports /tg/ mime backpack
2015-02-22 22:29:03 +01:00
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
Markolie 6d00d54b86 OpTable mousedrop checks 2015-02-22 05:07:43 +01:00
Artorp 6da4244ccc Gives the mime his very own door
- The door uses the freezer airlock icon
- The door has no sound for open/close
2015-02-22 04:51:04 +01:00
Markolie 631a1f93bb Ensure CentCom telecomms don't use power 2015-02-22 02:41:21 +01:00
Markolie 886bf7400b Final crafting fixes 2015-02-22 02:24:53 +01:00
Markolie efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
Markolie a2abae19cf Adjustments to freezer/heater celsius display, ensure empty AI core is taken off the list when destroyed 2015-02-21 23:56:10 +01:00
Markolie cb732b2b2d Adds celsius to the freezer/heater 2015-02-21 22:14:02 +01:00
ZomgPonies c91558b095 Merge pull request #379 from Markolie/master
Bug fixes
2015-02-21 15:02:56 -05:00
Markolie d2dcb7a041 Fix AI tracking, atmospherics construction, blob talk fix, ERT radio fix 2015-02-21 20:56:55 +01:00
Artorp c93bc2acf8 Fixed autolathe merge conflict 2015-02-21 01:36:14 +01:00
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
Markolie 98fe1820a4 Disable typing indicator, fix radio toggle 2015-02-20 19:58:12 +01:00
Artorp 616cc2209f Overhaul of canister variables
- Moves reference lists to their own datum
- Changes to nanoUI data gathering, large variables are no longer stored
on the atom
2015-02-20 19:56:58 +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.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01: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
Markolie dad0b2d856 Fix AI tracking, karma message fix, karma say fix, robot storage sprite change 2015-02-19 01:05:00 +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
Mark van Alphen 175b7a2118 Merge pull request #318 from ZomgPonies/wishgranter
Modifies the wishgranter
2015-02-17 23:24:36 +01: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
Artorp b89385144a Added queue functionality to the autolathe 2015-02-17 17:27:42 +01:00
Markolie 9b61724f01 Let robots put people on optables 2015-02-17 17:13:42 +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 be00a555fa Fix plasma decal, mapfix 2015-02-17 02:07:31 +01:00
Markolie 9f40758ce5 Move hacking screen to the top when panel is unscrewed 2015-02-16 22:02:41 +01: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
ZomgPonies 1bed62cf75 Modifies the wishgranter 2015-02-15 10:27:22 -05:00
Artorp 839ac9e026 Moves plasma decal from N2 tank to plasma tank 2015-02-15 09:54:07 +01:00