Commit Graph

15196 Commits

Author SHA1 Message Date
Fox-McCloud
15b4fc04a5 plasma in blumpkins 2017-02-07 07:01:58 -05:00
Fox-McCloud
7d72f348c3 Fix Diona Nymph Crossing Trays--Refactors Diona Feeding 2017-02-06 21:15:19 -05:00
Markolie
7b755d2511 Add warp cube to supply shuttle blacklist 2017-02-06 21:07:22 +01:00
Markolie
18688e6142 I can uncomment you now 2017-02-06 20:51:08 +01:00
Markolie
96bd88badb Fix action item message 2017-02-06 20:50:31 +01:00
Markolie
5deafdb4e5 Fix Destroy() return, replace set_dir with setDir 2017-02-06 20:44:12 +01: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
7513c5d396 Camera on paranormal ERT hardsuit fix, eye of god message fix 2017-02-06 20:31:31 +01:00
Markolie
8e4439c7f1 Add immortality talisman, add final items 2017-02-06 20:08:52 +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
Markolie
2a23862c6a Kinetic accelerator update, other fixes 2017-02-06 18:39:03 +01:00
uraniummeltdown
bbe7663e21 fixed enter_link 2017-02-06 20:22:08 +04:00
Crazy Lemon
e4e99039ea Merge pull request #6321 from uraniummeltdown/aidead
AI Sprites, Vox clothing sprites, click AI display as AI to interact with it
2017-02-06 07:13:05 -08:00
Crazy Lemon
3146568d4d Merge pull request #6319 from KasparoVy/ipcname
IPC Names now Load Correctly from SQL
2017-02-06 07:11:07 -08:00
Fox McCloud
800a54cc15 Merge pull request #6320 from Kyep/ert_shuttle_access
Fixes ERT and SST shuttle accesses
2017-02-06 10:08:33 -05:00
uraniummeltdown
cd865ac1f2 revert immovable rod announcement change 2017-02-06 18:56:23 +04: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
fb926cb0d4 Merge pull request #6328 from uraniummeltdown/linglink
Hivemind Link
2017-02-06 07:26:20 -05:00
Crazy Lemon
4a1cbc1536 Merge pull request #6344 from Fox-McCloud/hivelord-GC
Makes Hivelord Cores GC
2017-02-06 04:12:22 -08:00
Crazy Lemon
32bbf77be6 Merge pull request #6286 from uraniummeltdown/aimech
AI control beacons for mechs
2017-02-06 04:04:34 -08:00
Fox-McCloud
bdaf614b9d Makes Hivelord Cores GC 2017-02-06 05:54:32 -05:00
Fox-McCloud
249cd3279c Merge remote-tracking branch 'upstream/master' into stunprod 2017-02-06 05:35:59 -05:00
Fox McCloud
39c8c9e2c5 Merge pull request #6323 from Markolie/fixxxxx
Fix airless plating map issue
2017-02-06 05:17:31 -05:00
Fox McCloud
4f05357bae Merge pull request #6335 from uraniummeltdown/objection
Plasmaman Lawyer Suit
2017-02-06 05:16:58 -05:00
VampyrBytes
a65948afaf Fixes magnetic gripper drop item verb (#6338)
Fixes #6317

The name on this verb was the same as the name on
`\client\verb\drop_item()` and that was the verb that was actually
getting called, which does nothing if you're a robot
2017-02-06 05:16:10 -05:00
Fox McCloud
37fd14fd17 Merge pull request #6336 from uraniummeltdown/attacknotjump
removes attack_not_jump from notify_ghosts
2017-02-06 05:15:32 -05:00
Fox McCloud
051ce5a78c Merge pull request #6333 from uraniummeltdown/oreboxscanner
Use advanced mining scanner on ore box to interact with it
2017-02-06 05:10:35 -05:00
Fox McCloud
4e901962d4 Merge pull request #6334 from uraniummeltdown/xenoconsole
Constructible Xenobiology Console
2017-02-06 05:09:51 -05:00
Fox-McCloud
462ef49c29 tweaks 2017-02-06 04:37:15 -05:00
Markolie
ee3417f19a Update chance 2017-02-06 01:42:59 +01:00
Markolie
dbe1284214 Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord 2017-02-06 01:42:32 +01:00
Markolie
72aec0f9f1 Add shared storage and godeye items, split Lavaland loot files 2017-02-06 01:02:03 +01:00
KasparoVy
ef5376ede2 conflict resolution 2017-02-05 17:13:34 -05:00
Markolie
b17dca7c57 Prevent signing own blood contract, prevent megafauna from healing on station, prevent hierophant teleports from going to Central Command 2017-02-05 20:36:04 +01:00
Markolie
4100482e76 Remove remaining newscast announcements 2017-02-05 20:15:24 +01: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
d87603054b say_log for mobs, fixed changeling absorb memory, changelings can now see past 8 messages of absorbed victim 2017-02-05 22:00:17 +04:00
Tigercat2000
5e8c14789b Merge remote-tracking branch 'upstream/master' into shuttle_hijack2 2017-02-05 07:41:14 -08: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
Fox-McCloud
c5f3cf94e9 replica pod people 2017-02-05 09:55:10 -05:00
Fox-McCloud
69e1c69bec fishwater re-addition 2017-02-05 09:36:27 -05:00
uraniummeltdown
e64c057842 Merge remote-tracking branch 'remotes/upstream/master' into objection
# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
2017-02-05 17:11:24 +04:00
uraniummeltdown
3e6ee0c306 plasmaman lawyer/IAA suit 2017-02-05 17:06:27 +04:00
Fox-McCloud
3b59726371 Botany Reagent Changes 2017-02-05 06:25:39 -05:00
Fox-McCloud
390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
uraniummeltdown
332deb840e Merge remote-tracking branch 'remotes/upstream/master' into events
# Conflicts:
#	code/modules/events/immovable_rod.dm
2017-02-05 14:04:45 +04:00
uraniummeltdown
5cf03d211d removes attack_not_jump from notify_ghosts 2017-02-05 13:44:59 +04:00
Crazy Lemon
01c41cfb86 Merge pull request #6081 from Markolie/lavaland_megafauna
Ports Lavaland megafauna
2017-02-05 00:27:40 -08:00