Commit Graph

14119 Commits

Author SHA1 Message Date
tigercat2000
c0e0e14b78 Merge pull request #8072 from Birdtalon/fix
Paint Bucket Fix
2017-09-10 11:37:19 -07:00
FlattestGuitar
387608425e that's a whoops 2017-09-10 16:59:18 +02:00
Birdtalon
4bc42a609d paint bucket fix 2017-09-09 20:12:17 +01:00
Crazy Lemon
42ec14cc5f Merge pull request #8026 from PJB3005/changeturf-light-removal-fix
Fix changeturf not properly destroying own lights.
2017-09-02 19:05:07 -07:00
Crazy Lemon
32e665aa97 Merge pull request #7909 from Citinited/nothing-could-go-wrong
Adds flaming shots and Flaming Moes
2017-09-02 18:53:11 -07:00
Pieter-Jan Briers
4fd1a1ff78 Fix changeturf not properly destroying own lights.
Changeturf doesn't call Destroy() so lights on the source turf weren't getting removed, resulting in runtimes later as the light attempted to remove from a turf that didn't know about it.
2017-08-30 00:02:45 +02:00
Birdtalon
d78c1a3fb9 wall-locker bugfix 2017-08-29 15:46:44 +01:00
tigercat2000
c281ee7b77 Revert "Buffs the HoP Door remote" 2017-08-28 21:35:18 -07:00
Crazy Lemon
3637086018 Merge pull request #8003 from Fox-McCloud/ipc-dissection
Adds IPC Dissection Surgery
2017-08-28 15:46:16 -07:00
Fox McCloud
71cfaa2325 Merge pull request #7983 from Birdtalon/wall-lockers
Control click to open wall lockers.
2017-08-28 18:24:08 -04:00
Fox McCloud
70cd062699 Merge pull request #7999 from Birdtalon/door-remote
Buffs the HoP Door remote
2017-08-28 18:23:55 -04:00
Fox McCloud
43e8e2d334 Merge pull request #7989 from Aurorablade/Ihateyoupeople
Removes the special off Cult Daggers
2017-08-28 18:15:51 -04:00
Crazy Lemon
fdc8c6dc37 Merge pull request #8010 from Birdtalon/bee-cease
Makes Syndicate Bee-case sound local.
2017-08-28 15:10:34 -07:00
tigercat2000
f747d4948b Merge pull request #7920 from Fox-McCloud/musics
Adds a Bunch of Instruments
2017-08-28 14:21:39 -07:00
tigercat2000
414524b9d2 Merge pull request #8013 from Jovaniph/holosword
Holodeck Sword Sound
2017-08-28 13:43:12 -07:00
Fox-McCloud
16bff9cc86 longer musics 2017-08-27 19:49:40 -04:00
Birdtalon
0daed1cfe2 adds pineapple and derivatives 2017-08-26 22:07:51 +01:00
Jovaniph
e0303df139 Holodeck Esword 2017-08-26 08:46:50 -04:00
Aurorablade
66fc88f4af Shoo.. 2017-08-25 20:48:05 -04:00
Birdtalon
ad703a69a1 makes the bee-case sound local 2017-08-24 23:58:24 +01:00
tigercat2000
b110ff791f Merge pull request #7991 from Birdtalon/cultstructures
Cult structures take damage from melee and projectiles.
2017-08-24 06:50:40 -07:00
Fox-McCloud
bf89625f47 Adds IPC Dissection Surgery 2017-08-22 18:18:41 -04:00
Birdtalon
d7a6833268 alters door remotes 2017-08-22 16:12:12 +01:00
Birdtalon
410607d249 missed an operator 2017-08-17 09:48:15 +01:00
Birdtalon
272b5f2210 Fox Requests 2017-08-17 09:36:23 +01:00
Fox McCloud
13c112358a Merge pull request #7534 from Kyep/ssd_button
Admin 'List SSDs' verb & cryo option
2017-08-16 19:58:52 -04:00
Fox-McCloud
881c0e9d92 Merge remote-tracking branch 'upstream/master' into musics 2017-08-16 19:12:46 -04:00
Fox-McCloud
cf4735a069 Merge remote-tracking branch 'upstream/master' into HUNKE 2017-08-16 18:36:30 -04:00
Birdtalon
2b774dc1e5 allows cult structures to die 2017-08-16 21:10:23 +01:00
tigercat2000
ebabda1223 Merge pull request #7366 from KasparoVy/mob_rgb_to_hex
Converts Mob Colours to Hexadecimal
2017-08-16 12:52:13 -07:00
tigercat2000
608a0b0644 Merge pull request #7759 from Citinited/flagged-for-review
Adds in-hand sprites for missing flags; adds a plasmaman flag; miscellaneous flag tweaks
2017-08-16 12:11:05 -07:00
Crazy Lemon
57891127b4 Merge pull request #7963 from Aurorablade/FORTHESWARM
Swarmer Tweaks
2017-08-16 11:58:02 -07:00
Aurorablade
ca17cc865c tweak 2017-08-15 23:55:29 -04:00
Aurorablade
008ab50d90 dammit 2017-08-15 02:30:27 -04:00
Aurorablade
cc3f7ef188 cuffs 2017-08-14 23:52:10 -04:00
tigercat2000
d90229e2ad Merge pull request #7839 from taukausanake/buffs_duffs
Buffs duffs
2017-08-14 10:57:06 -07:00
tigercat2000
4cd00729f5 Merge pull request #7864 from Citinited/video-killed-the-radio-star
No more cheesing the gateway with video cameras
2017-08-14 10:54:23 -07:00
Birdtalon
7aa7634d4a fixes crates 2017-08-14 18:05:04 +01:00
Birdtalon
d22f02af01 shortcut to open wall lockers 2017-08-14 10:32:15 +01:00
KasparoVy
29ee96be8f Blood Trail Colouration is the Same as Pools
Blood pools had a duplicate definition of "NO_CLIENT_COLOUR" while it
wasn't defined at all for blood trails.

This resulted in a bug where upon wearing a pair of noir shades or
becoming colourblind, blood trails would take on a different colouration
than blood pools (drips, etc.)

Now resolved by moving the duplicate definition to a place where it can
do some good.
2017-08-09 23:14:39 -04:00
Aurorablade
f45e09a2d0 fixes a sentance 2017-08-09 14:44:23 -04:00
Aurorablade
01fbf449d2 Buffs Swarmers 2017-08-09 00:20:26 -04:00
Fox-McCloud
ba9f53ba21 small performance tweak 2017-08-08 23:17:21 -04:00
taukausanake
3e86cb1a8c Merge branch 'Paradise-clean' into buffs_duffs 2017-08-06 22:07:10 -05:00
Crazy Lemon
21bd7e7f24 Merge pull request #7919 from Fox-McCloud/hydro-updates
Updates Hydroponics, Nerfs it, Adds Onions
2017-08-06 06:45:36 -07:00
Fox McCloud
2dcae64f3a Merge pull request #7876 from Aurorablade/Clothes
Obligatory Vox in a Corset
2017-08-06 08:53:13 -04:00
Fox McCloud
89ecb7345a Merge pull request #7837 from SamHPurp/whoops
Adds Garbage receptacle by the kitchen and fixes a few map bugs.
2017-08-06 08:42:13 -04:00
Fox McCloud
ee7432136a Merge pull request #7917 from Birdtalon/confusedcollab
Reduces confusion for antagonist collaborators
2017-08-06 08:38:31 -04:00
Citinited
89b494b90d Typecasting 2017-08-06 01:33:36 +01:00
Citinited
1e7c22acc8 it's update_icon not update_icons 2017-08-06 01:12:29 +01:00