Fox McCloud
18cbce0ec6
Merge pull request #8350 from KasparoVy/fix_hair_dye
...
Fixes Barber's Dye Bottle
2017-11-05 17:33:45 -05:00
KasparoVy
727cf1998a
Fixes Barber's Dye Bottle
...
My own bad, I changed the way mob colours are handled without updating
dye bottles.
Ironically, it seems I'd already sorted out the OTHER kind of hair dye
(the reagent).
2017-11-05 17:20:56 -05:00
Aurorablade
3a63b17657
guardian runtime
2017-11-05 01:10:34 -05:00
Crazy Lemon
7ceffd1098
Merge pull request #8343 from Fox-McCloud/remote-talk-metagaming
...
Fixes Remote Talk Metagaming
2017-11-04 18:51:55 -07:00
FalseIncarnate
66f10657bd
fix merge conflicts (again)
2017-11-04 17:37:30 -04:00
Fox-McCloud
f6d64455ff
Fixes Remote Talk Metagaming
2017-11-04 16:05:57 -04:00
Crazy Lemon
63ad6a2efb
Merge pull request #8131 from MarsM0nd/Holofix
...
Makes holograms end when they should
2017-11-01 10:14:10 -07:00
Crazy Lemon
961676d097
Merge pull request #8286 from Aurorablade/CultPassSprites
...
Cult Pass Split:Sprites
2017-11-01 10:12:40 -07:00
Aurorablade
0984c623e1
adds tome
2017-10-29 17:57:56 -04:00
tigercat2000
7ca26db3f3
Merge pull request #8285 from Aurorablade/CultPasBalance
...
Cult Pass split: Balance shit
2017-10-29 11:17:39 -07:00
FalseIncarnate
c1e1dc22d8
merge conflict fix
2017-10-28 18:38:20 -04:00
tigercat2000
a90f6aa0ce
Merge pull request #8313 from Kyep/vamp_jaunt_fix
...
200th PR: Fixes vamp jaunt/shadowstep working on z2
2017-10-28 13:53:31 -07:00
Crazy Lemon
4c48d24967
Merge pull request #7776 from tigercat2000/radio_comms_fluff
...
Air Traffic Control & Map Lore
2017-10-28 12:42:56 -07:00
tigercat2000
a5e4ccdc18
Merge pull request #8103 from FalseIncarnate/reagents
...
Silver Slime Core and Random Reagent changes
2017-10-27 09:23:50 -07:00
tigercat2000
13edd0a91d
Merge pull request #8288 from FreeStylaLT/paramedics_anti_theft_movement
...
Moves Paramedic's key from his clothes-locker to his EVA locker, removes an extraneous helmet from Paramedic's EVA locker
2017-10-26 15:32:53 -07:00
tigercat2000
46d46f50a3
Merge pull request #8287 from FreeStylaLT/icon_update
...
Adds a bunch of sprites for Medbay areas
2017-10-26 15:31:41 -07:00
tigercat2000
8a588d3aad
Merge remote-tracking branch 'upstream/master' into radio_comms_fluff
2017-10-26 12:02:31 -07:00
Kyep
4084ab3f35
Fixes vamp jaunt/shadowstep working on z2
2017-10-26 04:12:58 -07:00
tigercat2000
1f71d87332
Merge pull request #8273 from Kyep/ert_orders
...
ERT Spawn Tweaks
2017-10-25 16:42:30 -07:00
Crazy Lemon
b31110c0e8
Merge pull request #8270 from Kyep/ert_slots
...
ERT Configuration
2017-10-25 14:55:54 -07:00
Crazy Lemon
217b932606
Merge pull request #8220 from Anasari/BoomChickaWowWoW
...
Add chem reagent logging for grenade priming.
2017-10-25 14:31:09 -07:00
Crazy Lemon
10c8a7ac66
Merge pull request #8218 from Anasari/YouArePushingMyBhutan
...
War OP TC now scale to amount of players
2017-10-25 14:29:17 -07:00
FreeStylaLT
9bb03159f0
removes the extraneous helmet
2017-10-25 14:29:32 +09:00
Kyep
a60e37d56a
updates a comment
2017-10-24 00:11:44 -07:00
Kyep
3820f204dc
Gives jani ERT anti-spacevine items
2017-10-23 21:47:24 -07:00
tigercat2000
767634e7ac
Merge pull request #7615 from Crazylemon64/no_suicide_clone
...
No more cloning suiciders
2017-10-22 10:48:30 -07:00
Crazy Lemon
f0607410f9
Merge pull request #7268 from Allfd/syndiboots
...
Give nukeops magboots
2017-10-22 10:22:16 -07:00
Crazy Lemon
fcd3ea3194
Merge pull request #8241 from Allfd/fastest-linda
...
Fastest linda
2017-10-22 10:18:52 -07:00
FreeStylaLT
a9b4170a11
moves the key
2017-10-21 14:22:41 +09:00
FreeStylaLT
efa5b4b5bb
adds more
2017-10-21 14:11:24 +09:00
FreeStylaLT
3bd4c6a33f
fixes these abominations reee
2017-10-21 13:39:00 +09:00
Aurorablade
8115bdd0f0
Sprites
2017-10-20 19:23:05 -04:00
Aurorablade
f1c60a52ba
Balance
2017-10-20 18:44:59 -04:00
Kyep
83dcf5b68a
Let gamma borgs have module choice
2017-10-18 18:59:37 -07:00
Kyep
246e039ae6
Splits janitor/paranormal gear based on ERT level
2017-10-18 17:36:02 -07:00
Kyep
42089d1820
Spaces
2017-10-18 02:49:34 -07:00
Kyep
3e2c510cf1
Spawn Tweaks
2017-10-18 02:41:43 -07:00
Kyep
04fec43a9c
tweaks
...
- Removed duplicate boxes from janitor and paranormal ert loadouts
- Added telebaton to janitor loadout (they do have an all-access ID to
defend)
- Tweaked borgs to fix a runtime on spawn
- Clarified logging format
- Made panel look much nicer
- Added 2 and 4 slot options in panel
- Made no-slot positions display as '-' rather than '0'
2017-10-18 01:18:59 -07:00
Kyep
9b7def1f87
Initial version
2017-10-17 23:44:32 -07:00
tigercat2000
6f0167b777
Merge pull request #7735 from Citinited/miscellaneous-fixes
...
In which I fix a bunch of issues and tweak some other things
2017-10-15 19:40:46 -07:00
tigercat2000
57eba20480
Merge pull request #8198 from imsxz/mechs-are-kinda-op
...
Mech ballistics now must all re-arm
2017-10-15 16:06:54 -07:00
tigercat2000
f0c35da099
Merge pull request #8175 from TullyBurnalot/ShadowlingHealEyes
...
Shadowling Passive Healing now heals eye damage
2017-10-15 16:01:18 -07:00
tigercat2000
202113870b
Merge pull request #8177 from TullyBurnalot/ShadownerdFLAMES
...
Plasmamen Shadowlings no longer burn to death
2017-10-15 15:55:25 -07:00
Citinited
a0c3b893fe
Fixes Travis
2017-10-15 23:03:43 +01:00
Citinited
be97382c26
Tigercat & Fox tweaks
2017-10-15 23:03:28 +01:00
Citinited
2881fad0a3
Radiation mines no longer affect species with RADIMMUNE or NO_DNA flags
2017-10-15 23:03:16 +01:00
Citinited
353ceb0693
Throwing items through shocked airlocks will no longer cause the airlock to spark
2017-10-15 23:02:58 +01:00
Citinited
5f41e337fd
Firedoors can't be welded while open and can't open if they're welded
2017-10-15 23:02:58 +01:00
Citinited
6d5560afbd
Full-sized plasma windows are now fire-resistant; full-sized reinforced plasma windows are now fireproof
2017-10-15 23:02:58 +01:00
tigercat2000
5e7a9a6470
Merge pull request #7904 from FlattestGuitar/guardian-memes
...
Holoparasites. Take two.
2017-10-15 14:48:20 -07:00
