Fox-McCloud
da1dcab8ea
Fixes Picking Up Items
2017-11-22 19:38:52 -05:00
tigercat2000
19adf0bfa5
Merge pull request #8279 from msgerbs/master
...
Fixes weirdness when a mob being force-fed finishes a snack
2017-11-13 07:55:20 -08:00
tigercat2000
df0b404252
Merge pull request #8365 from Allfd/ambulance
...
Atmos Fix
2017-11-13 07:54:05 -08:00
tigercat2000
0dcfd4de5a
Merge pull request #8342 from Fox-McCloud/food-recipe-fix
...
Fixes Enchilada Food Recipe
2017-11-13 07:53:33 -08:00
Alffd
c293259397
Fix issue with not ending draining
2017-11-12 20:54:27 -05:00
Alffd
c084f43aca
Reversed owner
2017-11-12 20:42:04 -05:00
Fox McCloud
399219b31d
Merge pull request #8368 from tigercat2000/512
...
512 Compilation & Travis
2017-11-12 18:37:52 -05:00
tigercat2000
2a9c7cffa8
Merge pull request #8332 from Kyep/execute_round_two
...
Helps prevent blatently illegal executions
2017-11-11 21:16:11 -08:00
Kyep
269f2426ff
Tiger requests
2017-11-11 16:07:10 -08:00
Kyep
c0f0eb7921
Tully requests
2017-11-11 16:00:14 -08:00
tigercat2000
b4fa39d940
512 Compilation & Travis
2017-11-11 09:50:21 -08:00
tigercat2000
367f0f1ca2
Merge pull request #8155 from FalseIncarnate/windows
...
Windows Update
2017-11-10 22:00:19 -08:00
Alffd
a2e9258b7b
Atmos Fix
2017-11-11 00:10:21 -05:00
Crazy Lemon
86676221b5
Merge pull request #8242 from Allfd/vamp
...
Makes vampires more containable
2017-11-10 12:29:43 -08:00
Alffd
a1c085ac0c
Makes blood loss more reasonable
2017-11-10 14:03:02 -05:00
tigercat2000
612d81a906
Merge pull request #8291 from Anasari/AssumingGender
...
Stop assuming gender.
2017-11-10 10:15:17 -08:00
tigercat2000
5450fe3e73
Merge pull request #8338 from Anasari/NorthernHair
...
Add in 79 polaris hairstyles
2017-11-10 09:59:53 -08:00
Kyep
6e7e5aa355
Removes centcom colorizing
2017-11-08 02:18:51 -08:00
FalseIncarnate
49c65da656
Shuttle window health reduction
2017-11-07 21:20:09 -05:00
Aurorablade
36e0e8832a
F
2017-11-05 21:43:50 -05:00
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
6a941a8526
Message and spacing tweaks
2017-11-04 18:13:39 -04: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
Fox-McCloud
58724b4b73
Fixes Enchillada Food Recipe
2017-11-04 15:46:35 -04:00
Ansari
d77748fd70
Fix Doublebun & Bun4 not working.
...
TRAVIS SAMA DELIVER ME
2017-11-02 21:35:25 +08:00
Ansari
eb65912c14
Add in 3 missing hairstyle to the code. Remove redundant Joestar & Doublebuns from dmi file.
2017-11-02 20:09:08 +08:00
Ansari
4e9196f5ae
Port in 77 hairstyles from Polaris
2017-11-02 17:35:58 +08:00
Ansari
266a96a23c
remove redundant you
2017-11-02 11:23:55 +08:00
Ansari
da924006a6
guess i spaced out during this one
2017-11-02 11:20:37 +08: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
Crazy Lemon
8ad740ffd4
Merge pull request #8321 from Kyep/fix_freedom_suit
...
Fixes Freedom Op suits going red when toggled
2017-11-01 09:57:09 -07:00
Kyep
a5f770020f
Helps prevent blatently illegal executions
2017-10-31 20:10:41 -07:00
Crazy Lemon
7c55215cc9
Merge pull request #8324 from naisudev/master
...
Adds the GitHub button
2017-10-30 14:18:27 -07:00
Ansari
c22534dd28
\the
2017-10-30 07:51:29 +08: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
tigercat2000
2ba2bcbfb1
Merge pull request #8298 from Allfd/ionfix
...
Ion Rifles are not pistols
2017-10-29 11:14:54 -07:00
tigercat2000
5303242597
Merge pull request #8315 from Anasari/SyndicateBalanceTatorOnly
...
Syndicate Item Rebalance PR. Tator Items Only.
2017-10-28 17:56:24 -07:00
Ansari
51160cdfab
Hacked AI module cost changed back to 14
2017-10-29 08:07:28 +08:00
VexingRaven
b5d4c80d30
Fixes weirdness when a mob being force-fed finishes a snack
2017-10-28 18:22:06 -05:00
FalseIncarnate
c1e1dc22d8
merge conflict fix
2017-10-28 18:38:20 -04:00
tigercat2000
138b376796
Merge pull request #8319 from Landerlow/sake
...
Adds sake to hacked booze dispenser
2017-10-28 14:19:06 -07: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
tigercat2000
d7770cdb56
Merge pull request #8309 from Squirgenheimer/typofix
...
Fixes small typo for energy crossbow design datum
2017-10-28 13:52:43 -07:00
tigercat2000
317067b7cf
Merge pull request #8301 from Kyep/ghost_hud
...
Improves Ghost HUDs
2017-10-28 13:50:14 -07:00
