Markolie
a99b4ece15
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix
2017-03-16 22:36:00 +01: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
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
Crazy Lemon
661939c145
Merge pull request #6691 from davipatury/rcl
...
Port's RCL from /vg/
2017-03-11 15:30:48 -08:00
Crazy Lemon
175a4475f0
Merge pull request #6676 from KasparoVy/TailMarkingFix
...
Fixes a Bug With Tail Markings
2017-03-11 15:27:57 -08:00
Crazy Lemon
a5f594ce37
Merge pull request #6689 from Fox-McCloud/nerf-shotguns
...
Nerfs Buckshot
2017-03-11 15:26:58 -08:00
Jovan
48caf853d5
forgot other file yaya
2017-03-11 16:51:04 -05:00
Jovan
54ee658a94
mesies fix voxy stuff, yaya?
2017-03-11 16:50:13 -05:00
Jovan
f1188c0ecc
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise.git into vulpevasuit
2017-03-11 16:45:02 -05:00
Markolie
255a6a1c17
Set poll time of cult demon to 100
2017-03-11 18:26:04 +01:00
Markolie
5c20a29b1d
Fix statue welding, fix firedoor message spam, fix slaughter candidate pick
2017-03-11 18:25:23 +01:00
Kyep
14d0c0da7a
Fixes #5694 - Phazons not phasing, toxic injector being broken
...
🆑 Kyep
fix: Phazons' phase ability now works again.
fix: Phazons' toxin injector melee damage type (a weak melee attack) now
works again.
/🆑
2017-03-11 04:42:31 -08:00
uraniummeltdown
33548720eb
adds 5 runed metal to strong supply talisman
2017-03-11 15:36:47 +04:00
Kyep
b6b1b3c0aa
Stops Wild West syndie mobs blowing themselves up on their own mines
...
🆑 Kyep
fix: Syndicate mobs in the Wild West are no longer so stupid that they
trip over, and die to, their own mines.
/🆑
2017-03-11 02:11:33 -08:00
Jovan
22db913d9f
conflict fixing.
2017-03-11 05:08:19 -05:00
Jovan
054a4ce3f1
Merge Fix?
2017-03-11 05:05:49 -05:00
Fox McCloud
3c7d990061
Merge pull request #6710 from uraniummeltdown/coverflags
...
Cleaned up clothing flags
2017-03-11 04:57:15 -05:00
Fox McCloud
d6da6e3f52
Merge pull request #6527 from davipatury/modular_computers
...
Port's TG's modular computers
2017-03-11 04:51:49 -05:00
Fox McCloud
654840ddfd
Merge pull request #6719 from uraniummeltdown/cawcaw
...
Removes Vox EVA suits
2017-03-11 04:44:44 -05:00
Fox McCloud
4e76b226f9
Merge pull request #6721 from Markolie/firelockdoorclose
...
Minor firelock/airlock force change and firelock explosion change
2017-03-11 04:43:16 -05:00
Fox McCloud
e4dacf2296
Merge pull request #6732 from Krausus/CanYouHearTheBwoink
...
Fixes Admin Bwoink Preference
2017-03-11 04:41:00 -05:00
Jovan
19a44e7172
added vulpkanin eva suit
2017-03-11 02:09:16 -05:00
uraniummeltdown
04368ef0c5
removes Vox EVA suits, adds sprite_sheets and sprite_sheets_obj to regular EVA suits, added 2 more EVA suits to map in place of Vox ones
2017-03-11 10:39:56 +04:00
Krausus
a803500489
Fixes admin bwoink preference
...
Non-admin players no longer get the (unusable) verb to toggle it, nor is
its setting respected when PMing them
2017-03-10 19:46:35 -05:00
uraniummeltdown
9eb7eea1e9
removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA
2017-03-10 22:46:02 +04:00
FlattestGuitar
8c9b1ab043
Adds clicks to flashlights
2017-03-10 17:21:09 +01:00
Crazylemon64
25cde1f8e8
Reverts rwall change, reworks aggressive spread instead
2017-03-10 04:56:10 -08:00
Crazylemon64
577bf23226
Max-power kudzu should be less station-eating
...
Rwalls now resist weak explosions - allowing them to resist aggressive
vines perfectly
Bluespace vines lose their "potential energy" after piercing through a
single tile, so as to not allow station-engulfing monstrosities to grow
unchecked
Vines no longer normally spread on space tiles - this is now reserved for
space covering vines (and bluespace in seldom occasions) only
Makes kudzu events kick off more interestingly
2017-03-10 04:42:27 -08:00
Markolie
0bc0a2c461
All types of crystals
2017-03-10 12:45:47 +01:00
