Commit Graph

25141 Commits

Author SHA1 Message Date
FlattestGuitar
e31d2c3c98 Simplifies admin announcements 2017-03-22 08:59:03 +01:00
Fox McCloud
31f6bb205a Merge pull request #6814 from Jovaniph/evaspriteupdate
Tajaran EVA Suit Sprites and Minor Updates
2017-03-20 16:41:59 -04:00
Fox McCloud
472bd7b887 Merge pull request #6813 from SamHPurp/fixes-vent-text
Fixes
2017-03-20 16:39:10 -04:00
KasparoVy
467c7fa1ae Fixes Glovesnipping
Attempting to snip gloves runtimed out because of that accidental
shift-key period business. Works again.
2017-03-20 05:34:25 -04:00
Sam
e43cb810a8 More bits wew. 2017-03-20 06:37:56 +00:00
Sam
343d466287 Reverts NanoTrasen edits following convo with Fox/Regen 2017-03-19 21:31:42 +00:00
king5327
09719f9f84 Brought the borer channel message up to date. 2017-03-19 17:02:46 -04:00
Fox McCloud
c87cfba248 Merge pull request #6791 from SamHPurp/removes-moderator
Removes unused 'Mod' from Adminwho
2017-03-19 10:13:40 -04:00
Fox McCloud
d0a8a3994d Merge pull request #6787 from uraniummeltdown/shippingerror
Shipping Error
2017-03-19 10:12:48 -04:00
Fox McCloud
7b4a000f4f Merge pull request #6807 from Jovaniph/voxyhatsyaya
Voxy Hats Sprites Yaya.
2017-03-19 10:03:56 -04:00
Sam
3af44d2a08 More typos fixed... 2017-03-19 05:13:20 +00:00
Sam
3b166bcb97 Fixes formatting issue ( Thanks @Tigercat2000 ) 2017-03-19 04:29:18 +00:00
Sam
4f4e749b83 Fixes infinite production of cable coil 2017-03-19 04:25:41 +00:00
Sam
d5d3fdfc84 Fixes typos, and changes a name to bring it inline with the rest of the assemblies 2017-03-19 03:54:45 +00:00
Jovan
9aed97a244 Tajaran EVA Suit and some updates 2017-03-18 21:29:39 -04:00
Sam
db89c499ce Fixes some capitalisation stuff...
Pedantry!
2017-03-19 01:09:47 +00:00
Sam
0c97c47dd8 Fixes the wording on opening vents 2017-03-19 00:42:14 +00:00
uraniummeltdown
9c6fe041cc Merge branch 'master' into dogbed 2017-03-18 18:50:18 +04:00
Fox McCloud
7011cee0fb Merge pull request #6794 from FlattestGuitar/doot-doot
Admins can now stop global sounds played by other admins 🎶
2017-03-18 09:57:49 -04:00
Fox McCloud
daa1e80f21 Merge pull request #6801 from Markolie/zefix
Mecha fabricator fix
2017-03-18 09:39:34 -04:00
Jovan
3fde1afd65 Vox hats yaya 2017-03-18 04:20:56 -04:00
uraniummeltdown
6d27ce0a62 added 10% chance for random crate to be added to supply shuttle on calling it to station 2017-03-18 11:19:31 +04:00
Crazy Lemon
78d8248e72 Merge pull request #6800 from Fox-McCloud/surgery-fix
Fixes Abductor Surgery
2017-03-17 15:55:23 -07:00
Markolie
045787a066 Mecha fabricator fix 2017-03-17 23:41:56 +01:00
Fox-McCloud
991bd8c702 Fixes Abductor Surgery 2017-03-17 18:28:23 -04:00
uraniummeltdown
cd6b6a61d7 added dog beds craftable from 10 wood planks 2017-03-17 17:46:04 +04:00
Fox McCloud
50cc0057e7 Merge pull request #6778 from FlattestGuitar/announce
Easier communications report cancelling 📣
2017-03-17 08:59:48 -04:00
Fox McCloud
949b0950b8 Merge pull request #6779 from uraniummeltdown/shard
Attacking with shards now hurts your hand if not wearing gloves
2017-03-17 08:59:12 -04:00
Fox McCloud
b964485e08 Merge pull request #6785 from Jovaniph/unathieva
Unathi EVA Suit
2017-03-17 08:57:12 -04:00
FlattestGuitar
50460043e0 Admins can now stop global sounds played by other admins 2017-03-17 12:57:25 +01:00
Sam
adde8bb5bf Removes 'Moderator' from Adminwho
Literally unplayable
2017-03-17 03:15:20 +00:00
Crazy Lemon
4e9236090e Merge pull request #6776 from FlattestGuitar/shoes
Ports tg's winter boots 👞
2017-03-16 17:46:27 -07:00
Crazy Lemon
5cdaa624de Merge pull request #6761 from Jovaniph/doorsounds
New sounds for Firelock, Airlock Closing, and Airlock External
2017-03-16 17:30:35 -07:00
Markolie
31e10b1b07 Flavor text fix, disabilities window popup 2017-03-16 23:51:46 +01:00
Markolie
e2a30cc7fe Preference, changeling and record fixes 2017-03-16 23:39:26 +01:00
Markolie
a99b4ece15 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix 2017-03-16 22:36:00 +01:00
Jovan
af62b3f3a7 Unathi EVA Suit 2017-03-16 08:25:52 -04:00
uraniummeltdown
b686cad0ce robo hands aren't affected by shard cutting into hand 2017-03-16 16:20:46 +04:00
FlattestGuitar
0e4c51d6fe Easier communications report cancelling 2017-03-15 19:49:27 +01:00
FlattestGuitar
603668fb23 Adds winter boots; adds workboots to the loadout system 2017-03-15 19:45:40 +01:00
uraniummeltdown
6ca139974d glass shards now deal brute to your hand if not wearing gloves 2017-03-15 19:39:54 +04:00
Fox McCloud
6bfd4013c0 Merge pull request #6753 from uraniummeltdown/grilles
Grille Code Update
2017-03-15 07:48:17 -04:00
Fox McCloud
c6e3fe3cdb Merge pull request #6734 from uraniummeltdown/plastic
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
2017-03-15 06:33:02 -04:00
uraniummeltdown
d9dd77327a increased time, wirecutter is now a welder 2017-03-14 18:21:21 +04:00
uraniummeltdown
0fc0aac229 remove target argument from ex_act() 2017-03-14 15:20:33 +04:00
Fox McCloud
0103f297bb Merge pull request #6741 from uraniummeltdown/supplytalisman
Adds 5 Runed Metal to Supply Talisman
2017-03-14 06:35:34 -04:00
Crazy Lemon
fde675b2ad Merge pull request #6737 from uraniummeltdown/crowbartiles
Quick Tile Replacement
2017-03-13 13:35:51 -07:00
Crazy Lemon
b7610a66a9 Merge pull request #6742 from Kyep/phazon_fix
Fixes #5694 - Phazons not phasing, toxic injector being broken
2017-03-13 13:29:58 -07:00
Crazy Lemon
4edee61021 Merge pull request #6739 from Kyep/gateway_wildwest_mines
Stops Wild West syndie mobs killing themselves with their own mines
2017-03-13 13:14:34 -07:00
Markolie
d458902782 Fix Jaws of Life unpowered door forcing 2017-03-13 14:11:19 +01:00