Fox-McCloud
e1200d6a1e
Merge remote-tracking branch 'upstream/master' into peacekeeper-borgs
2017-08-16 22:08:07 -04:00
Fox McCloud and GitHub
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 and GitHub
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
cf4735a069
Merge remote-tracking branch 'upstream/master' into HUNKE
2017-08-16 18:36:30 -04:00
tigercat2000 and GitHub
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 and GitHub
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 and GitHub
57891127b4
Merge pull request #7963 from Aurorablade/FORTHESWARM
...
Swarmer Tweaks
2017-08-16 11:58:02 -07:00
Fox McCloud and GitHub
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
808c35a7ab
sanity checking for AI damage
2017-08-15 18:27:17 +01:00
Aurorablade
cc3f7ef188
cuffs
2017-08-14 23:52:10 -04:00
Fox McCloud and GitHub
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 and GitHub
f74e0cb0e5
Merge pull request #7966 from AndrewMontagne/feature/improve-modular-computers
...
Fixes for Modular Computers
2017-08-14 11:26:07 -07:00
tigercat2000 and GitHub
d90229e2ad
Merge pull request #7839 from taukausanake/buffs_duffs
...
Buffs duffs
2017-08-14 10:57:06 -07:00
tigercat2000 and GitHub
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
tigercat2000 and GitHub
6e2c7ab0cf
Merge pull request #7973 from Birdtalon/spidermanbots
...
Fixes Spiderbots being unable to pass tables.
2017-08-14 10:46:57 -07:00
Birdtalon
7aa7634d4a
fixes crates
2017-08-14 18:05:04 +01: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
Birdtalon
ba7c5467c8
allows spiderbots to pass tables
2017-08-12 17:42:03 +01:00
Crazy Lemon and GitHub
97c8140031
Merge pull request #7823 from FlattestGuitar/fluffles
...
Fluff item for R3Valkyrie
2017-08-12 02:01:53 -07:00
Andrew O'Rourke
24774a2201
Fixed issue where attempting to clone a file did nothing.
2017-08-10 21:36:59 +01:00
Andrew O'Rourke
c9a052616e
Modular computers printer now makes printing noises when it prints.
2017-08-10 20:44:12 +01:00
Andrew O'Rourke
b12e5cb296
Fixed issue where modular computers files were getting erroneously garbage collected after being edited.
2017-08-10 20:24:16 +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
Andrew O'Rourke
14a60a23e7
Fixed modular computers printer not printing fields onto paper.
2017-08-09 23:01:40 +01: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
FlattestGuitar
c6a40b7291
Merge branch 'master' into fluffles
2017-08-07 11:43:58 +02:00
taukausanake
3e86cb1a8c
Merge branch 'Paradise-clean' into buffs_duffs
2017-08-06 22:07:10 -05:00
Crazy Lemon and GitHub
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 and GitHub
83c6c168b7
Merge pull request #7941 from Kyep/smite_bless_fix
...
Fixes #7925 for smite/bless and SIT
2017-08-06 09:35:47 -04:00
Fox McCloud and GitHub
3a2544319a
Merge pull request #7833 from Crazylemon64/oraoraoraoraoraora
...
Admins can now set a var to allow a mob to spam-attack
2017-08-06 09:28:53 -04:00
Fox-McCloud
b1495e7cf5
comment tweak
2017-08-06 09:06:57 -04:00
Fox McCloud and GitHub
2dcae64f3a
Merge pull request #7876 from Aurorablade/Clothes
...
Obligatory Vox in a Corset
2017-08-06 08:53:13 -04:00
Fox McCloud and GitHub
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 and GitHub
1c64b71a5c
Merge pull request #7885 from shazbot194/Drone_gibber
...
Changes the icon for the matter decompiler
2017-08-06 08:39:39 -04:00
Fox McCloud and GitHub
ee7432136a
Merge pull request #7917 from Birdtalon/confusedcollab
...
Reduces confusion for antagonist collaborators
2017-08-06 08:38:31 -04:00
tigercat2000 and GitHub
4eeb5c55d6
Merge pull request #7847 from Crazylemon64/i#forgot#spaces
...
Paranoid sanitization now allows parentheses and common punctuation
2017-08-05 23:47:09 -07: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
Crazylemon64
9b780a6b5b
Admins can now set a var to allow a mob to spam-attack
2017-08-05 07:25:52 -07:00
Crazy Lemon and GitHub
d18c20cb9f
Merge pull request #7939 from Fox-McCloud/wormsss
...
Makes has_brain_worms cheaper
2017-08-05 07:16:58 -07:00
Crazy Lemon and GitHub
8575e3a6d5
Merge pull request #7931 from Fox-McCloud/tesla-performance
...
Reduces Tesla Cost
2017-08-05 07:04:39 -07:00
Crazy Lemon and GitHub
0b68b623c4
Merge pull request #7923 from Fox-McCloud/porta-turret
...
Porta Turret Performance Fixup
2017-08-05 07:01:28 -07:00
Kyep
568874ed6a
Fixes #7925 for smite/bless and SIT
2017-08-05 01:58:53 -07:00
Citinited
988ed89710
Fixes some instances of disposals sending things to nullspace
2017-08-05 05:51:54 +01:00
Fox-McCloud
b366f5e598
Makes has_brain_worms cheaper
2017-08-04 23:37:17 -04:00
Fox-McCloud
c3ed8de770
faster
2017-08-04 17:15:47 -04:00
Fox-McCloud