tigercat2000
|
3f70feda25
|
Merge pull request #8095 from Birdtalon/syndie
Syndicate Hardsuit wording change
|
2017-09-14 15:57:35 -07:00 |
|
Birdtalon
|
6834d0aec6
|
syndie suits armour values don't change
|
2017-09-14 16:20:06 +01:00 |
|
tigercat2000
|
484af3afc4
|
Merge pull request #7827 from FalseIncarnate/plumbing
Plumbing Update
|
2017-09-12 20:20:23 -07:00 |
|
Andrew O'Rourke
|
6bc33bd2a1
|
Fixed paper. Calls updateinfolinks() after populating the fields, instead of before.
|
2017-09-12 23:31:48 +01:00 |
|
tigercat2000
|
fdca509b74
|
Merge pull request #8057 from Aurorablade/Scream
[FIX]Prevents emotes from happening under certain conditions
|
2017-09-11 12:41:17 -07:00 |
|
HugoLuman
|
a1f154eb0f
|
Adds a patreon fluff item to the game.
Signed-off-by: HugoLuman <qaggeler@uci.edu>
|
2017-09-07 19:57:11 -07:00 |
|
Aurorablade
|
2c6a4cabfc
|
screan
|
2017-09-07 18:37:24 -04:00 |
|
Kyep
|
e2b460faae
|
Fixes invisimin
🆑 Kyep
fix: Admins under the effects of 'invisimin' no longer show up on sec
huds, medical huds, etc.
/🆑
|
2017-09-04 16:43:59 -07:00 |
|
Crazy Lemon
|
75ad492830
|
Merge pull request #8001 from Birdtalon/flipping-heck
Flips have a chance to fail! How embarrassing...
|
2017-09-02 19:04:39 -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 |
|
Crazy Lemon
|
0de3101a27
|
Merge pull request #8025 from Landerlow/enzymerecipe
Adds a recipe to create enzymes to cook with
|
2017-09-02 13:16:24 -07:00 |
|
Crazy Lemon
|
d66434120a
|
Merge pull request #7869 from shazbot194/Enforcer_upgrade
New enforcer sprites, adds suppressor and flashlight support, and a trainer
|
2017-08-31 17:44:15 -07:00 |
|
Landerlow
|
c5e6a4ec24
|
Changes mix message and adds green vomit recipe
|
2017-08-30 15:17:16 +02:00 |
|
Landerlow
|
1981de5156
|
Changed plantmatter ingredient requirement to vomit
|
2017-08-30 14:39:12 +02:00 |
|
Landerlow
|
c3da1b5c96
|
adds a recipe to create enzymes
|
2017-08-29 21:59:45 +02:00 |
|
Fox McCloud
|
da8407c2e8
|
Merge pull request #7956 from FlattestGuitar/more-fluff
Fluffs for Desolate, Hylocereus, Shazbot
|
2017-08-28 19:40:43 -04:00 |
|
Fox McCloud
|
5fdca7b4ec
|
Merge pull request #8009 from matt81093/cyborg_module_patch
Allows medical cyborgs to diagnose IPC's with robutt analyzer
|
2017-08-28 18:39:55 -04:00 |
|
Fox McCloud
|
04ee51da86
|
Merge pull request #7977 from Birdtalon/mining-robots
Nanotrasen Mining Bots take EMP damage.
|
2017-08-28 18:24:36 -04:00 |
|
Fox McCloud
|
3c3b384824
|
Merge pull request #7982 from Aurorablade/InsertGodHere
ALL HAIL <INSERT GOD HERE>!
|
2017-08-28 18:24:22 -04:00 |
|
tigercat2000
|
f747d4948b
|
Merge pull request #7920 from Fox-McCloud/musics
Adds a Bunch of Instruments
|
2017-08-28 14:21:39 -07:00 |
|
Crazy Lemon
|
8c0014de9a
|
Merge pull request #8011 from Landerlow/moredisabilities
Adds more roundstart disability options
|
2017-08-28 13:30:33 -07:00 |
|
Birdtalon
|
b6b0970d76
|
commas are important
|
2017-08-26 23:13:20 +01:00 |
|
Birdtalon
|
553a79984f
|
adds protein and tomatojuice to the pizza
|
2017-08-26 23:02:10 +01:00 |
|
Birdtalon
|
af2035af2b
|
pineapples grow on plants not trees
|
2017-08-26 22:47:05 +01:00 |
|
Birdtalon
|
53a141f9ca
|
recipe change
|
2017-08-26 22:36:44 +01:00 |
|
Birdtalon
|
bf5ea8fcea
|
final additions
|
2017-08-26 22:33:01 +01:00 |
|
Birdtalon
|
0daed1cfe2
|
adds pineapple and derivatives
|
2017-08-26 22:07:51 +01:00 |
|
Landerlow
|
9a01252a2a
|
Added the scrambled speech to the list and changed dizziness
|
2017-08-26 12:46:46 +02:00 |
|
Landerlow
|
71be8f3c8b
|
Adds more roundstart disability options
|
2017-08-25 18:44:33 +02:00 |
|
Matthew Kelley
|
88e989e5d2
|
Allows medical cyborgs to diagnose IPC's
|
2017-08-24 03:37:10 -05:00 |
|
Fox-McCloud
|
6a24d8bc02
|
Fixes Bloodless Internal Bleeding
|
2017-08-22 17:25:27 -04:00 |
|
Birdtalon
|
f5c91f6a70
|
implied sauce
|
2017-08-22 21:20:27 +01:00 |
|
Birdtalon
|
b0635fcb43
|
flips now have a chance to fail!
|
2017-08-22 21:14:18 +01:00 |
|
FlattestGuitar
|
1759adc852
|
No more warden coat
|
2017-08-22 11:30:07 +02:00 |
|
Fox McCloud
|
e24d8d3c28
|
Merge pull request #7940 from Citinited/cleaning-disposals
[s]Fixes an issue with the disposal system
|
2017-08-16 21:33:31 -04: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 |
|
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 |
|
Fox McCloud
|
5fa583aaea
|
Merge pull request #7984 from Birdtalon/swarming
AI Damage Sanity check (Prevents swarmers killing it)
|
2017-08-15 22:27:49 -04:00 |
|
Birdtalon
|
fc36a61b21
|
Fox adjustment
|
2017-08-15 18:32:23 +01:00 |
|
Birdtalon
|
808c35a7ab
|
sanity checking for AI damage
|
2017-08-15 18:27:17 +01:00 |
|
Aurorablade
|
1779d14c46
|
Chaplain only god in prayer..maybe..
|
2017-08-15 05:05:11 -04:00 |
|
Fox McCloud
|
4da7fba866
|
Merge pull request #7986 from Birdtalon/medbutts
Hacky "Fix" for medbot internal beakers
|
2017-08-14 23:02:27 -04:00 |
|
Aurorablade
|
46b99794b0
|
Surgery Fix
|
2017-08-14 18:50:58 -04:00 |
|
Birdtalon
|
d19d319eb1
|
horrible hacky fix
|
2017-08-14 19:32:18 +01:00 |
|
tigercat2000
|
f74e0cb0e5
|
Merge pull request #7966 from AndrewMontagne/feature/improve-modular-computers
Fixes for Modular Computers
|
2017-08-14 11:26:07 -07:00 |
|
Birdtalon
|
e3c98f79c4
|
remove trailing newline
|
2017-08-14 11:40:46 +01:00 |
|
Birdtalon
|
44aca352cf
|
prevents swarmers from attacking the AI
|
2017-08-14 11:37:27 +01:00 |
|