Commit Graph

25126 Commits

Author SHA1 Message Date
Sam
343d466287 Reverts NanoTrasen edits following convo with Fox/Regen 2017-03-19 21:31:42 +00: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
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
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
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
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
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
Markolie
3d8b2543c5 Fix follow source on brig doors 2017-03-13 13:46:19 +01:00
Markolie
60496300ea Fix attack message on vent weld 2017-03-13 13:42:12 +01:00
Jovan
7898583968 Change Door Sounds 2017-03-13 06:25:19 -04:00
Markolie
4edf69c3c0 Revenant nightvision fix 2017-03-12 20:59:28 +01:00
uraniummeltdown
dedc33a23f decon time 15 -> 26 2017-03-12 17:57:30 +04:00
uraniummeltdown
49910617f3 crowbar/screwdriver(wood) in inactive hand, attack floor with tile to replace quickly 2017-03-12 17:26:07 +04:00
uraniummeltdown
70c2a27d16 Merge branch 'master' into grilles 2017-03-12 16:52:13 +04:00
uraniummeltdown
2af6b1de23 grille code updates from tg, removed attack_self() from rods they now use recipes, refactored grille (de)construction, added broken grille object for mapping, grilles can be damaged by throwing objs or mobs at them, also general code cleanup 2017-03-12 16:35:24 +04:00
Fox McCloud
80430ffe3c Merge pull request #6727 from Crazylemon64/kudzu_spread_nerf
Kudzu Rebalance
2017-03-12 04:10:59 -04:00
Fox McCloud
1a23c8a199 Merge pull request #6746 from Markolie/zefix
Fixes
2017-03-12 03:42:06 -04:00
Fox McCloud
7b47e6b52b Merge pull request #6736 from Jovaniph/vulpevasuit
Adds Vulpkanin EVA suit sprite
2017-03-12 03:40:48 -04:00
Fox McCloud
0fe2a135e4 Merge pull request #6728 from FlattestGuitar/click
Adds clicks to flashlights 🔦
2017-03-11 21:26:23 -05:00
uraniummeltdown
85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04:00
Jovan
65cb35fbb2 please no merge conflict. 2017-03-11 19:21:06 -05:00
Crazy Lemon
9de6d25f07 Merge pull request #6696 from davipatury/hallo-2
Hallucinations 2.0
2017-03-11 15:33:47 -08:00