ZomgPonies
90c5083ddf
Fix for rod inhands.
2015-02-26 17:05:23 -05:00
ZomgPonies
bdb54c4378
Adds leather chaps for both regular and fat people
2015-02-26 16:56:28 -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
Mark van Alphen
32919be0a7
Merge pull request #428 from Artorp/AutolatheQueue
...
Autolathe queue shows items being processed
2015-02-26 19:20:29 +01:00
Mark van Alphen
30fca58c4f
Merge pull request #427 from ZomgPonies/cargo
...
Crates are mailed with manifests taped to the outside
2015-02-26 19:20:24 +01:00
ZomgPonies
ccfb89199e
New sea admiral suit and hat
2015-02-26 12:58:20 -05:00
ZomgPonies
130b051a7e
Switch jukebox from WMP to VLC (CROSS PLATFORM, OGG SUPPORT)
2015-02-26 12:46:56 -05:00
ZomgPonies
9dc5f6750c
Firedoors no longer block zones
2015-02-26 12:43:39 -05:00
ZomgPonies
c8d9598098
Fixed up the give verb
2015-02-26 10:03:24 -05:00
ZomgPonies
10bef3e8dd
Rods now change sprite depending on how much in the stack
2015-02-26 09:21:13 -05:00
ZomgPonies
ba1f04e0a0
Bantime fixins
2015-02-26 09:12:32 -05:00
Fox-McCloud
164608a9ab
Fixes Being On Fire
2015-02-26 04:56:46 -05:00
Fox-McCloud
9850e6deb2
Laser Additions and Taser Nerf
2015-02-25 23:34:42 -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
Mark van Alphen
eea58c6951
Merge pull request #415 from ZomgPonies/superhero
...
Superhero Part 2: Owlman vs. The Griffin!
2015-02-26 00:59:37 +01:00
Artorp
8f1081a86f
Autolathe queue fix
...
Old oversight, stacks and cost calculation was bugged
2015-02-26 00:41:58 +01:00
Artorp
90e346fef3
Autolathe queue support for stacks
...
- Processing line (first item in list) will now show stack multiplier
where applicable
- Resources are taken before item is being created, to properly update
the UI
2015-02-26 00:02:13 +01:00
Markolie
a63ce564fd
Reduce Diona healing
2015-02-25 22:45:06 +01:00
Markolie
e9e4437e91
Re-add nymph code
2015-02-25 22:26:38 +01:00
Markolie
d9f083c39c
Fix nanites
2015-02-25 22:25:22 +01:00
Artorp
99d5a4970b
Autolathe queue shows items being processed
2015-02-25 22:23:40 +01:00
Markolie
d118e026fa
Re-apply kitchen code
2015-02-25 22:14:14 +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
8e159c51b3
Ensure extinguisher precision works
2015-02-25 21:33:34 +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
ZomgPonies
887e4b93f7
Ported outside crate manifest
2015-02-25 14:02:14 -05: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
Mark van Alphen
367fd7abea
Merge pull request #425 from ZomgPonies/master
...
Custom Item - Telvayne
2015-02-25 18:51:36 +01:00
ZomgPonies
e8036a074d
Custom Item - Telvayne
2015-02-25 12:46:44 -05:00
Mark van Alphen
ab98e134e1
Merge pull request #423 from ZomgPonies/master
...
Emergency GC fix for reagents
2015-02-25 18:18:07 +01:00
ZomgPonies
739882d6d1
Emergency GC fix for reagents
2015-02-25 12:14:18 -05:00
Mark van Alphen
f15f8fb5ae
Merge pull request #422 from ZomgPonies/master
...
GC fixes
2015-02-25 17:49:17 +01:00
ZomgPonies
3e4b4d2b6a
Merge pull request #406 from SamCroswell/master
...
ERT Rework
2015-02-25 11:43:07 -05:00
ZomgPonies
710d60abda
GC fixes
2015-02-25 10:58:56 -05: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
8714512403
Superhero Part 2: Owlman vs. The Griffin!
2015-02-24 20:13:00 -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
SamCroswell
f004028d2b
ERT - Medic Hypospray Fix
...
The medic's default hypospray was empty. Whoops.
Should be filled with DD now.
2015-02-24 14:36:04 -05:00
ZomgPonies
358cdf110d
Merge pull request #409 from ParadiseSS13/Markolie-patch-1
...
Rename Shuttle.dm to shuttle.dm
2015-02-24 14:29:26 -05:00
ZomgPonies
367c8ba519
Merge pull request #411 from Markolie/master
...
Bug fixes
2015-02-24 14:29:14 -05:00
