Commit Graph

4021 Commits

Author SHA1 Message Date
Artorp 95538029a1 Harvesting animals will always gib 2015-03-02 20:14:02 +01:00
Artorp c35711c394 Makes harvest() give meat equal to meat_amount 2015-03-02 19:50:50 +01:00
ZomgPonies efcbfebf99 Emergency corgi runtime Fix 2015-03-02 11:22:21 -05:00
Fox-McCloud 63352fcfc2 Merge pull request #479 from ZomgPonies/darkness
The Ghostsight the server deserves
2015-03-02 00:57:12 -05:00
ZomgPonies 6979cf6089 Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup
Chemistry Cleanup and Fixes
2015-03-01 23:08:16 -05:00
DZD 69eb5509ec Fixes exchange document objective 2015-03-01 20:35:09 -05:00
ZomgPonies bc7088a6d7 Added AIeye to new system 2015-03-01 19:40:02 -05:00
Fox-McCloud 3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -05:00
ZomgPonies 2b917b17cd Merge pull request #475 from Markolie/master
Bug fixes galore
2015-03-01 14:41:42 -05:00
Markolie d7a2559065 Bug fixes galore 2015-03-01 20:35:07 +01:00
Mark van Alphen 5b4c156989 Merge pull request #459 from ZomgPonies/corgi
Ports CorgiUI
2015-03-01 18:30:21 +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
ZomgPonies 5a94b87331 Merge pull request #457 from Fox-McCloud/Cameras
Camera Update+Camera Bugs
2015-03-01 12:28:58 -05:00
Fox-McCloud a7f631f364 Health and Stack Fixes 2015-03-01 01:07:14 -05:00
Markolie 6b70bfec74 NanoUI update 2015-03-01 04:22:12 +01:00
Markolie be47c7007a Fixes alien spacewalking 2015-02-28 23:12:18 +01:00
Fox-McCloud a9285627ac Merge remote-tracking branch 'upstream/master' into Cameras 2015-02-28 16:24:03 -05:00
Markolie 5e4539157c Add minimum age for drones/ERT 2015-02-28 19:40:56 +01:00
Markolie 99dd8bf811 Fix handcuff mob sprite not updating 2015-02-28 17:54:37 +01:00
Mark van Alphen 18692eedfe Merge pull request #450 from ZomgPonies/fixuns
More fixins and various features
2015-02-28 17:33:28 +01:00
ZomgPonies ba2b5589e9 Ported CorgiUI 2015-02-28 10:59:14 -05:00
ZomgPonies 89ce02b426 Merge pull request #451 from Markolie/master
Temperature fixes
2015-02-28 09:48:01 -05:00
Markolie a735e6855c Reduce malf ticker time, update fire damage, fix breathing 2015-02-28 15:44:43 +01:00
Fox-McCloud 62462c876f Camera Update+Camera Bugs 2015-02-28 04:01:14 -05:00
Fox-McCloud 0aa45feffb Merge pull request #439 from TheDZD/minor-fixes
Swaps Xeno Sentinel and Hunter Health Values
2015-02-27 20:07:56 -05:00
Fox-McCloud 87c15c4e3f Merge pull request #441 from SamCroswell/master
Quick-Equip Hotkey Fix, Pulse Rifle Icon Fix
2015-02-27 20:07:34 -05:00
SamCroswell 75b2220e3e Merge Conflic Fix
Conflicts:
	icons/obj/gun.dmi
2015-02-27 15:52:26 -05:00
Markolie 42935580da Adjust cold temperature message 2015-02-27 21:32:31 +01:00
Markolie 7c2224b880 Temperature fixes 2015-02-27 21:11:36 +01:00
ZomgPonies b1395e0b35 Disabling drone sprite picking as per community vote 2015-02-27 12:56:43 -05:00
Mark van Alphen d89c885a14 Merge pull request #435 from ZomgPonies/fixuns
Various fixings and additions
2015-02-27 18:22:35 +01:00
SamCroswell fa882c7516 Quick-Equip Hotkey Fix
The quick equip hotkey now checks to see if the RIG helmet you're trying
to equip actually requires to be attached to the suit or not.
2015-02-26 21:26:23 -05:00
ZomgPonies ff05a93a08 DERPEDYDERP 2015-02-26 18:04:57 -05:00
DZD b359bc663b Swaps Xeno sentinel and hunter health values 2015-02-26 15:04:25 -05:00
ZomgPonies 2f9b435a0f Merge pull request #426 from Markolie/master
Bug fixes, add atmos watertank
2015-02-26 13:50:37 -05:00
ZomgPonies eaeb045afe Unique suits for plasmamen jobs 2015-02-26 13:32:42 -05:00
ZomgPonies c8d9598098 Fixed up the give verb 2015-02-26 10:03:24 -05:00
Fox-McCloud 164608a9ab Fixes Being On Fire 2015-02-26 04:56:46 -05:00
ZomgPonies 5421754760 Merge pull request #418 from Fox-McCloud/Fixes-Genetics
Fixes, Genetics, and Balance
2015-02-25 21:56:33 -05:00
Markolie a63ce564fd Reduce Diona healing 2015-02-25 22:45:06 +01:00
Markolie 5d529c8086 Plant-B-Gone now affects Diona nymphs. Dionas now heal toxin/fire damage. 2015-02-25 22:07:23 +01:00
Markolie bfe8a12f1e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
2015-02-25 20:44:32 +01:00
Markolie 6efa3bcdaa Fix trays (now bags) 2015-02-25 20:42:43 +01:00
Markolie 89650e8590 Extinguisher wheelchair update, deathsquad robot fix 2015-02-25 19:56:24 +01:00
Markolie e1f0d0fec7 Bug fixes, add atmos watertank 2015-02-25 19:47:04 +01:00
FalseIncarnate ea468678b6 Remove unused cooldown check
Removes the accidental inclusion of an unused flip cooldown check for
monkey emotes.
2015-02-25 01:30:36 -05:00
FalseIncarnate 60d27e07de Emote Cooldown System
Introduces the Emote Cooldown System, designed to prevent spamming of
sound-based emotes.

Emotes that respect the cooldown:
- *beep
- *buzz
- *ping
- *squish
- *scream
- *fart
- *chirp
- *law
Emotes that are exempt:
- Everything not listed above

Emotes can be added to the system easily, and all cooldown-incurring
emotes share a single cooldown. This means you have to wait to *scream
after you *fart.

Also adds Tigercat's *squish emote ( #394 ), with sound credit to
DrMinky(Freesound.org). This emote is only usable by Slime People, and
accepts a parameter if you wish to squish at something/someone.

Admins with +VAREDIT can manually disable the use of cooldown emotes for
a specific mob by setting the emote_cd var to 2.
2015-02-25 01:14:06 -05:00
Fox-McCloud b3acc43c76 fatty 2015-02-24 23:38:47 -05:00
Fox-McCloud 85d79677b1 Fixes, Genetics, and Balance 2015-02-24 22:58:05 -05:00
ZomgPonies 9ca2500cf3 Merge pull request #414 from Markolie/master
Mapfix, hivemind fix
2015-02-24 19:48:36 -05:00