cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-01 18:23:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 9 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

5039 Commits

Author SHA1 Message Date
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 91878efbdc Fix position of robotic talk follow 2015-02-25 20:47:03 +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
Markolie da05274bf4 Mapfix, hivemind fix 2015-02-25 01:13:53 +01:00
ZomgPonies 80b83105fe Merge pull request #399 from Fox-McCloud/flip 
*flip
 2015-02-24 18:35:23 -05:00
ZomgPonies 367c8ba519 Merge pull request #411 from Markolie/master 
Bug fixes
 2015-02-24 14:29:14 -05:00
Markolie b44255d250 Bug fixes 2015-02-24 18:57:12 +01:00
Mark van Alphen ae04cce220 Merge pull request #397 from ZomgPonies/garbage 
vg Garbage Collector
 2015-02-24 18:28:45 +01:00
ZomgPonies ef7fe5a181 Optimizing lobby stuff 2015-02-24 11:22:12 -05:00
ZomgPonies 859c907962 Merge pull request #396 from Markolie/master 
Bug fixes, bot process update
 2015-02-24 08:01:25 -05:00
Markolie 3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +01:00
Fox-McCloud 4b127dfadd *flip 2015-02-23 18:49:48 -05:00
ZomgPonies 5c14d9c5f2 vg Garbage Collector 2015-02-23 17:18:38 -05:00
Fox-McCloud 6fba118892 Merge remote-tracking branch 'upstream/master' into Fixes 2015-02-23 16:47:55 -05:00
Mark van Alphen 8457375738 Merge pull request #391 from ZomgPonies/schedule 
Goon process scheduler
 2015-02-23 19:46:17 +01:00
ZomgPonies 3c0d278a91 Scheduler fixes and additions 2015-02-23 10:35:25 -05:00
Fox-McCloud 96a941ba19 Fixes and Guns 2015-02-22 16:32:35 -05: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 aee4626ed9 Slow down milking Betsy 2015-02-22 21:31:28 +01:00
ZomgPonies 2c50a42ba7 Goon process scheduler 2015-02-22 15:24:46 -05:00
Markolie 377dfe894d Add attack animations 2015-02-22 21:15:54 +01:00
Markolie 0048394e3c Fix pAI universal translator toggle 2015-02-22 19:30:45 +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
ZomgPonies bb620841a1 Merge pull request #375 from Fox-McCloud/Thickmaterial 
Thickmaterial
 2015-02-22 08:26:02 -05:00
Fox-McCloud 232eaaac72 Revert "Revert "Tail Wagging System"" 
This reverts commit eb4f2af194.
 2015-02-22 04:41:02 -05:00
Fox-McCloud 10c06a71a2 Revert "Revert "Death Wagging"" 
This reverts commit 1c32a43506.
 2015-02-22 04:40:34 -05:00
Markolie 886bf7400b Final crafting fixes 2015-02-22 02:24:53 +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
ZomgPonies 660ce3454b COMIC mutation bugfix 2015-02-21 13:25:09 -05:00
ZomgPonies 6958c6f1bb Typo fix 2015-02-21 09:38:50 -05:00
ZomgPonies ad8d879349 Adds a public clown language 2015-02-21 09:37:45 -05:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
Markolie 63ceaad3ec Make sure dead people don't get a typing indicator 2015-02-21 02:50:46 +01:00
Mark van Alphen d126a98527 Merge pull request #371 from TheDZD/changeling 
Changeling Bugfixes
 2015-02-21 02:32:26 +01:00
ZomgPonies dd79cb9ef2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-20 19:26:30 -05:00