2f9b435a0f
Merge pull request #426 from Markolie/master
...
Bug fixes, add atmos watertank
2015-02-26 13:50:37 -05:00
eaeb045afe
Unique suits for plasmamen jobs
2015-02-26 13:32:42 -05:00
ccfb89199e
New sea admiral suit and hat
2015-02-26 12:58:20 -05:00
130b051a7e
Switch jukebox from WMP to VLC (CROSS PLATFORM, OGG SUPPORT)
2015-02-26 12:46:56 -05:00
c8d9598098
Fixed up the give verb
2015-02-26 10:03:24 -05:00
ba1f04e0a0
Bantime fixins
2015-02-26 09:12:32 -05:00
164608a9ab
Fixes Being On Fire
2015-02-26 04:56:46 -05:00
9850e6deb2
Laser Additions and Taser Nerf
2015-02-25 23:34:42 -05:00
5421754760
Merge pull request #418 from Fox-McCloud/Fixes-Genetics
...
Fixes, Genetics, and Balance
2015-02-25 21:56:33 -05:00
eea58c6951
Merge pull request #415 from ZomgPonies/superhero
...
Superhero Part 2: Owlman vs. The Griffin!
2015-02-26 00:59:37 +01:00
a63ce564fd
Reduce Diona healing
2015-02-25 22:45:06 +01:00
e9e4437e91
Re-add nymph code
2015-02-25 22:26:38 +01:00
d9f083c39c
Fix nanites
2015-02-25 22:25:22 +01:00
5d529c8086
Plant-B-Gone now affects Diona nymphs. Dionas now heal toxin/fire damage.
2015-02-25 22:07:23 +01:00
91878efbdc
Fix position of robotic talk follow
2015-02-25 20:47:03 +01:00
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
6efa3bcdaa
Fix trays (now bags)
2015-02-25 20:42:43 +01:00
89650e8590
Extinguisher wheelchair update, deathsquad robot fix
2015-02-25 19:56:24 +01:00
e1f0d0fec7
Bug fixes, add atmos watertank
2015-02-25 19:47:04 +01:00
367fd7abea
Merge pull request #425 from ZomgPonies/master
...
Custom Item - Telvayne
2015-02-25 18:51:36 +01:00
e8036a074d
Custom Item - Telvayne
2015-02-25 12:46:44 -05:00
ab98e134e1
Merge pull request #423 from ZomgPonies/master
...
Emergency GC fix for reagents
2015-02-25 18:18:07 +01:00
739882d6d1
Emergency GC fix for reagents
2015-02-25 12:14:18 -05:00
f15f8fb5ae
Merge pull request #422 from ZomgPonies/master
...
GC fixes
2015-02-25 17:49:17 +01:00
3e4b4d2b6a
Merge pull request #406 from SamCroswell/master
...
ERT Rework
2015-02-25 11:43:07 -05:00
710d60abda
GC fixes
2015-02-25 10:58:56 -05:00
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
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
b3acc43c76
fatty
2015-02-24 23:38:47 -05:00
85d79677b1
Fixes, Genetics, and Balance
2015-02-24 22:58:05 -05:00
8714512403
Superhero Part 2: Owlman vs. The Griffin!
2015-02-24 20:13:00 -05:00
9ca2500cf3
Merge pull request #414 from Markolie/master
...
Mapfix, hivemind fix
2015-02-24 19:48:36 -05:00
da05274bf4
Mapfix, hivemind fix
2015-02-25 01:13:53 +01:00
80b83105fe
Merge pull request #399 from Fox-McCloud/flip
...
*flip
2015-02-24 18:35:23 -05:00
367c8ba519
Merge pull request #411 from Markolie/master
...
Bug fixes
2015-02-24 14:29:14 -05:00
8807f13305
ERT - Helmets Change, Cells Capacity Adjustment
...
The pulse pistol now has 1600 max charge, the Carbine now has a max
charge of 4000.
ERT helmets no longer need to be fastened to their suits to be equipped,
as this was causing bugs.
2015-02-24 14:25:28 -05:00
b44255d250
Bug fixes
2015-02-24 18:57:12 +01:00
ae04cce220
Merge pull request #397 from ZomgPonies/garbage
...
vg Garbage Collector
2015-02-24 18:28:45 +01:00
ef7fe5a181
Optimizing lobby stuff
2015-02-24 11:22:12 -05:00
cd7b1a4075
ERT Rework - Part One
2015-02-24 09:47:44 -05:00
859c907962
Merge pull request #396 from Markolie/master
...
Bug fixes, bot process update
2015-02-24 08:01:25 -05:00
3f51486ba4
Bug fixes, bot proces controller update
2015-02-24 01:40:43 +01:00
4b127dfadd
*flip
2015-02-23 18:49:48 -05:00
5c14d9c5f2
vg Garbage Collector
2015-02-23 17:18:38 -05:00
6fba118892
Merge remote-tracking branch 'upstream/master' into Fixes
2015-02-23 16:47:55 -05:00
8457375738
Merge pull request #391 from ZomgPonies/schedule
...
Goon process scheduler
2015-02-23 19:46:17 +01:00
3c0d278a91
Scheduler fixes and additions
2015-02-23 10:35:25 -05:00
96a941ba19
Fixes and Guns
2015-02-22 16:32:35 -05:00
8f88221d42
Add sound to light smashing
2015-02-22 22:25:19 +01:00
004b365110
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/modules/reagents/reagent_containers/syringes.dm
2015-02-22 22:15:45 +01:00
ZomgPonies