Commit Graph

6136 Commits

Author SHA1 Message Date
Fox McCloud
39f5b5a5ef Merge pull request #6395 from uraniummeltdown/movetools
Move tools into tools.dmi, RSF sprite
2017-02-13 06:02:13 -05:00
Markolie
0aabf436db Fix ion trail effect 2017-02-11 20:33:26 +01:00
Markolie
900653ea0e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-11 20:31:23 +01:00
uraniummeltdown
3df3688e72 move all crates to crates.dmi 2017-02-11 17:44:20 +04:00
uraniummeltdown
e03981aa02 formatting tools.dm 2017-02-11 15:47:25 +04:00
uraniummeltdown
1edc9a63e8 add rsf icon+inhand from /vg/, move crowbar,cutters,screwdriver,welders,wrench,rcd,rsf to tools.dmi 2017-02-11 15:46:38 +04:00
Fox McCloud
04f5276047 Merge pull request #6350 from Markolie/lavaland_updates
Add remaining Lavaland loot, kinetic accelerator refactor
2017-02-11 00:02:42 -05:00
Crazy Lemon
cef7f35ce3 Merge pull request #6161 from tigercat2000/goonlights
Goonlights
2017-02-10 19:21:20 -08:00
Crazy Lemon
17281506d2 Merge pull request #6123 from KasparoVy/vulp-cblind
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
2017-02-10 18:27:58 -08:00
Crazy Lemon
ac69d35538 Merge pull request #6381 from Fox-McCloud/slaughter-fix
Fixes Slaughter Demon Bloodcrawl and Demonic Whisper
2017-02-10 17:19:54 -08:00
Markolie
dec9bc71ac Fix music import runtime 2017-02-10 18:59:58 +01:00
Markolie
a4422a41ee Re-add anchored check 2017-02-10 18:57:57 +01:00
Markolie
b0d4f5d92a Various fixes 2017-02-10 18:55:23 +01:00
Markolie
c14b560ee0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-10 18:21:06 +01:00
Markolie
c93a592102 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
#	code/modules/shuttle/supply.dm
2017-02-10 18:19:53 +01:00
Fox-McCloud
0ebd41b05e Fixes Slaughter Demon Bloodcrawl 2017-02-10 08:26:28 -05:00
Markolie
ed5ea305cc Add "Syndicate" prefix to Syndicate pAI card 2017-02-09 18:56:05 +01:00
Markolie
95f750d6f2 Add faction support to pAI's 2017-02-09 18:54:26 +01:00
Markolie
3298f7edce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
#	icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
Markolie
7039ac7a6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
2017-02-08 19:21:57 +01:00
Crazy Lemon
2d77a0ab4d Merge pull request #6357 from Fox-McCloud/var-edit-fixes
On Varedit Fixes
2017-02-07 20:01:32 -08:00
Crazy Lemon
d11dfa7a3b Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy
Refactors Reagent Tanks--Adds High Capacity Water Tank
2017-02-07 19:58:28 -08:00
Crazy Lemon
685250501b Merge pull request #6345 from Fox-McCloud/monkey-cube-refactor
Monkey cube refactor
2017-02-07 19:53:58 -08:00
Crazy Lemon
725ea4f3a7 Merge pull request #6349 from Fox-McCloud/ttv-cleanup
Tank Transfer Valve Cleanup and In-Hands
2017-02-07 19:51:59 -08:00
Crazy Lemon
23a43f141e Merge pull request #6329 from uraniummeltdown/mineral
Mineral Floors
2017-02-07 19:33:24 -08:00
Crazy Lemon
7561459cb5 Merge pull request #6296 from KasparoVy/steal-storageimp-check
Traitor Steal Objective now Checks Storage Implants
2017-02-07 10:05:44 -08:00
Crazy Lemon
c0ce60cc76 Merge pull request #6356 from Fox-McCloud/fixes-xeno-eggs
Fixes Xeno Eggs and Projectiles
2017-02-07 09:55:47 -08:00
Fox McCloud
6b10c515b1 Merge pull request #6341 from uraniummeltdown/crates
Engineering and Science crates
2017-02-07 09:20:57 -05:00
Fox-McCloud
ad2468196e On Varedit Fixes 2017-02-07 08:44:50 -05:00
Fox-McCloud
dc15825102 Fixes Xeno Eggs and Projectiles 2017-02-07 07:27:43 -05:00
Markolie
1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
2017-02-06 20:37:03 +01:00
Markolie
7a4c33bbcd Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions 2017-02-06 19:55:37 +01:00
Markolie
7bdc9a4ca7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
2017-02-06 18:54:04 +01:00
uraniummeltdown
3e7dafe21a move all floor tiles to tiles.dmi, origin_tech materials=1 for base tile object, rename tranquillite tile item state 2017-02-06 21:41:39 +04:00
Markolie
2a23862c6a Kinetic accelerator update, other fixes 2017-02-06 18:39:03 +01:00
Fox-McCloud
e8bc6da23a Tank Transfer Valve Cleanup and In-Hands 2017-02-06 12:19:57 -05:00
Crazy Lemon
cc2eceb0a3 Merge pull request #6186 from Fox-McCloud/stunprod
Tweaks the Stunprod
2017-02-06 05:46:26 -08:00
Fox McCloud
cd86cc5817 Merge pull request #6348 from Kyep/minefix
Prevents mines detonating when touched by ghosts
2017-02-06 07:28:03 -05:00
Kyep
5d35de452a Fixes conflict (rebase) 2017-02-06 04:09:15 -08:00
Kyep
b7590355b7 Fixes mines detonating when ghosts pass over them 2017-02-06 04:01:03 -08:00
Fox-McCloud
249cd3279c Merge remote-tracking branch 'upstream/master' into stunprod 2017-02-06 05:35:59 -05:00
Markolie
dbe1284214 Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord 2017-02-06 01:42:32 +01:00
KasparoVy
ef5376ede2 conflict resolution 2017-02-05 17:13:34 -05:00
Fox-McCloud
846ce475b2 Refactors Reagent Tanks--Adds High Capacity Water Tank 2017-02-05 13:58:24 -05:00
Markolie
83cd030134 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
2017-02-05 19:46:41 +01:00
uraniummeltdown
6f774c8e1e added engi+engisec, electric engi from TG and sci+scisec crates from /vg/ 2017-02-05 19:22:07 +04:00
Tigercat2000
129a57bd9b Goonlights
Ports Goon Lighting from /vg/station.

Summary -
 This adds smooth edges to all lighting in order to increase the
 aesthetic appeal of the lighting system.
 It works by using a matrix to change the appearance of the lighting
 overlay sprite, which has been changed to be a base for the matrix to
 modify.
 Ported from /vg/station with the help of @PJB3005. This lighting
 system is a hybrid between Mloc's lighting rewrite and Tobba's
 Goonlights.

Notable changes:
 - Darksight now matters on mobs. The lighting overlays are not
 alpha=255 when they are completely dark, meaning you can still see the
 floor- assuming you can view the turf at all, because it retains the
 luminousity setting.
   - This means Tajaran have 100% night vision again as they are
   intended to. Humans can see in a 3x3 square centered around
   themselves.

   - No, I'm not changing this, if it's even possible. This is how
   BYOND's lighting is meant to work. If you have any complaints about
   game balance, please feel free to make a pull request to change
   see_in_dark values, which will be seperately evaluated.

 - The lighting controller now runs at world.tick_lag, to emulate the
 realtime function of StonedMC. So far with my testing, this hasn't
 caused any noticable performance decreases- the lighting system is
 obviously more expensive than our previous iteration, however, it's not
 the next ZAS ;)

Technical Details:
 - /atom/movable/lighting_overlay/proc/get_clamped_lum has been removed,
 succeeded by /turf/proc/get_lumcount. They behave identically.
 - Turf lighting is actually controlled by four "corner" datums, which
 feed information into the overlay.
 - The way opacity is factored into the system has changed. Anything
 that doesn't use set_opacity is not going to work to block light.
 - /area/lighting_use_dynamic has been renamed to
 /area/dynamic_lighting, for consistency with /turf/dynamic_lighting.
 - Lighting is no longer seperately initialized for away missions. It is
 handled in ChangeTurf() as it should be.

Known & Unfixable issues:
 - There is a 5-10 second delay from starting the round to the lights
 turning on. Attribute it to "the powernet being spun up" if you would
 like to- but it's actually just how long it takes the lighting system
 to update every single turf on the map.

 - When you walk with a light on you, the light will actually jump ahead
 of you before you visually get to the tile. This is because of the
 movement gliding on mobs, realtime lighting actually goes faster than
 the glide takes to complete, so it appears that your lights are moving
 faster than you.

Thank you krausy~

Animated Goonlights

This adds an animate() call to the update_overlays() proc. This makes it
so that any light changes will smoothly transition between the changes
instead of instantly changing their appearance.

Also fixes a few issues pointed out on Github.

Change lighting animation (turns out the old one totally breaks if you toggle a light quickly, whoopsies)

Kill LIGHTING_INSTANT_UPDATES

isturf
2017-02-05 07:08:17 -08:00
uraniummeltdown
385db6d240 Merge remote-tracking branch 'remotes/upstream/master' into mineral
# Conflicts:
#	icons/obj/items.dmi
#	icons/turf/floors.dmi
2017-02-05 17:40:39 +04:00
Fox-McCloud
2c986259af Fixes Iconless Banana Peels 2017-02-05 06:43:14 -05:00
Fox-McCloud
390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00