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
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
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
ZomgPonies
9d5e259eb8
Merge pull request #440 from Fox-McCloud/Gamebreaking-Bug
...
Fixes a Gamebreaking Bug
2015-02-26 22:00:36 -05: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
Fox-McCloud
9bae042444
Fixes a Gamebreaking Bug
2015-02-26 21:07:50 -05:00
ZomgPonies
4fdd31f0da
5 new Vox quill styles, thanks to FullofSkittles
2015-02-26 20:08:20 -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
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
