Markolie
a99b4ece15
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix
2017-03-16 22:36:00 +01: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
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
Fox McCloud
80430ffe3c
Merge pull request #6727 from Crazylemon64/kudzu_spread_nerf
...
Kudzu Rebalance
2017-03-12 04:10:59 -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
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
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
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
Markolie
cf4f350a79
Let matter grippers carry firelock electronics and bluespace crystals
2017-03-10 12:44:37 +01:00
Markolie
a6a7cf9d36
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
# code/game/jobs/job/job.dm
2017-03-10 12:42:37 +01:00
uraniummeltdown
dd12fbe13a
new flags_cover var for clothes, adjust existing flags
2017-03-10 11:33:42 +04:00
Fox McCloud
d7d1e42cc2
Merge pull request #6678 from LordJike/carrot-tweaks
...
Makes carrots processable into wedges and makes said wedges fryable into carrot fries
2017-03-09 21:36:40 -05:00
Fox McCloud
9510fa9f6c
Merge pull request #6711 from Crazylemon64/playercreation_assembly_line
...
Streamlines the ghost-to-player creation process
2017-03-09 21:30:22 -05:00
Markolie
7ca5bfc061
Firelock force change, airlock jaws of life force change, station goal typo fix
2017-03-09 18:03:54 +01:00
Markolie
a376adc93e
Merge branch 'zefix' of https://github.com/Markolie/Paradise into zefix
2017-03-09 17:42:21 +01:00
Markolie
7cb52433d1
Fix AI blind issue
2017-03-09 17:41:46 +01:00
Mark van Alphen
93470e3570
Merge branch 'master' into zefix
2017-03-09 17:20:31 +01:00
davipatury
ed568e9081
Runtime fix.
2017-03-09 12:22:25 -03:00
davipatury
2a9bcde361
Fix conflicts.
2017-03-09 12:01:50 -03:00
davipatury
781e66ec52
Fix conflicts.
2017-03-08 12:57:45 -03:00
Crazylemon64
869c9b76c4
Streamlines the ghost-to-player creation process
...
Also refactors ERT equipment to be actual outfits instead of hardcoded
2017-03-08 05:49:49 -08:00
Markolie
8ed466955e
Surgery toolspeed changes
2017-03-08 10:46:43 +01:00
Markolie
acab5d5170
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
...
# Conflicts:
# code/game/objects/items/weapons/storage/bags.dm
# code/game/objects/items/weapons/storage/uplink_kits.dm
# code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
Crazy Lemon
6e7338a573
Merge pull request #6688 from Allfd/bible
...
Makes bible farting less predictable
2017-03-08 00:24:44 -08:00
Fox McCloud
aa6e25a7f3
Merge pull request #6648 from Kyep/event_rebalance
...
Tweaks Event Odds
2017-03-08 01:02:02 -05:00
Kyep
689f515388
Changed Traders chance back to 0
2017-03-07 21:41:18 -08:00
Fox McCloud
f96c335d1f
Merge pull request #6704 from uraniummeltdown/hardsuit
...
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
Fox McCloud
c973875b95
Merge pull request #6675 from Crazylemon64/monster_allocator_port
...
Ports Monster's finishing of the space allocator
2017-03-07 23:21:50 -05:00
