Commit Graph
373 Commits
Author SHA1 Message Date
Fox-McCloud 796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
Fox-McCloud d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Iamgoofball 617f2b8aec guys, the medical analyzer upgrade, go get it 2015-03-24 18:44:39 -07:00
Iamgoofball 015c9d4a11 muh spans 2015-03-24 18:20:50 -07:00
Iamgoofball 44d9ef204e snowflake code makes me *scream V2 2015-03-24 17:59:07 -07:00
Iamgoofball f5f172652e snowflake code makes me *scream 2015-03-24 17:58:10 -07:00
Fox-McCloud 6b543f37ff Merge remote-tracking branch 'upstream/master' into Health-Analyzer 2015-03-24 15:53:37 -04:00
Fox-McCloud 69bc15604d Health Analyzer Upgrading 2015-03-23 19:44:06 -04:00
Fox-McCloud aa5cdae070 Taperecorder Rework 2015-03-23 05:45:15 -04:00
ZomgPonies ab963bdb10 Merge pull request #594 from Fox-McCloud/Overcharged-Flash
Overcharged Flash
2015-03-19 01:42:03 -04:00
Markolie 74724e6936 Radio uplink refund fix 2015-03-17 22:54:21 +01:00
Fox-McCloud 2b33c18bfe Overcharged Flash 2015-03-17 17:10:24 -04:00
Markolie 12aaa6a93e Bug fixes 2015-03-17 16:16:44 +01:00
Markolie 23bae14e9c Fix monkeys picking up intercoms 2015-03-16 18:52:33 +01:00
ZomgPonies b51850dfdd Blueshield access change 2015-03-09 19:01:42 -04:00
ZomgPonies 9e57d2424f Merge pull request #528 from TheDZD/nano_pai
NanoUI pAIs
2015-03-08 13:23:05 -04:00
DZD d2d0627d43 NanoUI pAIs 2015-03-06 18:34:45 -05:00
ZomgPonies 8c34221110 Merge pull request #523 from Fox-McCloud/Syndi-Channel-Fix
Fixes
2015-03-06 12:55:24 -05:00
Fox-McCloud 7e542873fe Fixes 2015-03-06 01:13:03 -05:00
Fox-McCloud a911b53e8b Life Proc Changes--Cold Space and and Temp Handling 2015-03-04 05:42:12 -05:00
Artorp 838b3960cc Fixes taperecorder emag_act() 2015-03-02 17:58:28 +01:00
ZomgPonies 6979cf6089 Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup
Chemistry Cleanup and Fixes
2015-03-01 23:08:16 -05:00
Fox-McCloud 9235af2a3d Tweaking 2015-03-01 17:34:03 -05:00
ZomgPonies f262c04a79 Merge pull request #476 from Markolie/master
Re-add borer event, adjust vine event weight, fix magistrate headset
2015-03-01 15:15:12 -05:00
Markolie 3e01615ad7 Re-add borer event, adjust vine event weight, fix magistrate headset, mapfix 2015-03-01 21:04:11 +01:00
ZomgPonies 7799470ca5 Merge pull request #460 from Markolie/master
Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes
2015-03-01 12:30:15 -05:00
Markolie 6b70bfec74 NanoUI update 2015-03-01 04:22:12 +01:00
Markolie 84a1947c2f Give Blueshield a bowman headset 2015-02-28 20:09:27 +01:00
Fox-McCloud 62462c876f Camera Update+Camera Bugs 2015-02-28 04:01:14 -05:00
Markolie 140e767c01 Add dot to desc 2015-02-24 02:18:46 +01:00
Markolie 3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +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 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
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +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 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
Markolie 46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01: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
Markolie 21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +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
Markolie 0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
DZD a4cda9287f Merge with upstream/master 2015-02-12 16:43:01 -05:00
ZomgPonies 4d2ccff974 Moved bomb logging from adminlog to attacklog 2015-02-12 02:04:32 -05:00