Commit Graph

14673 Commits

Author SHA1 Message Date
FalseIncarnate e72fd8eae2 Fixes up battle terminal connections
Also increases the range on the first battle turn announcement to be
audible by both combatants, just like the turn announcements during the
battle.
2016-12-30 00:12:02 -05:00
FalseIncarnate da421d841c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pogo 2016-12-29 21:13:00 -05:00
Crazy Lemon ac597b7f8b Merge pull request #5806 from Markolie/cameraconsoleupdate
Camera console update
2016-12-29 01:18:21 -08:00
Crazy Lemon adf431b087 Merge pull request #5414 from Aurorablade/DWI
Template Shuttles
2016-12-29 01:12:52 -08:00
Crazy Lemon a2cd084fc9 Merge pull request #6016 from KasparoVy/altappearances-camerafix
Cameras Now Handle Disguises
2016-12-25 01:33:00 -08:00
FalseIncarnate 164585e9da Snow Wars Episode II: Attack of the Claus
Santa's back, and angrier than ever at the naughty spacestation crew!

Santa's maximum health now increases with each successive stage
(previously only increased at Stage 4)
- Stage 1: 150 health (unchanged)
- Stage 2: 200 health (what stage 4 used to be)
- Stage 3: 250 health
- Stage 4: 300 health

Santa's Melee forms have had their damage ranges buffed
- Previously 5-15 in Stage 1 and 15-25 in Stage 4, now 10-20 and 20-30
respectively

Melee Snowmen and Reindeer have had their health increased to provide
extra survivability as they attempt to get into attack range. Ranged
snowmen unchanged
- Snowmen: was 50, now 75
- Reindeer: was 50, now 80

Ranged snowmen can no longer drop the candy cane sword, as intended.
Drop chance unchanged (50% from melee snowmen)

Snowballs (ranged snowman attack) and Ornaments (Santa Stage 2 and Stage
3 attack) have had damage increased slightly. Ornament knockback
unchanged.
- Snowballs now deal 4 damage, was 3
- Ornaments now deal 7 damage, was 5

The away_mission_config.txt file in the /config folder will need to be
manually editted to reactivate the evil santa away mission.
2016-12-24 02:24:40 -05:00
Aurorablade 494040ea9d i feel sorry for everyone subscriving to this PR 2016-12-24 00:42:58 -05:00
Aurorablade e25ddf8329 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-24 00:18:40 -05:00
Fox McCloud 1b1aaa83c4 Merge pull request #6022 from Crazylemon64/comp3_machine_fix
Computer3 machines no longer set the user's machine to a datum
2016-12-23 22:19:13 -05:00
KasparoVy 59d7f71145 👀 2016-12-23 21:14:50 -05:00
Crazylemon64 9341861406 Computer3 machines no longer set the user's machine to a datum 2016-12-23 18:09:40 -08:00
Crazylemon64 526335a9b6 Paper hats and bandanas no longer runtime on {un,}equip 2016-12-23 17:19:50 -08:00
Crazy Lemon 11311b1c18 Merge pull request #6018 from Fox-McCloud/refactor-fix
Fixes Nightvision, Darksight, and X-Ray
2016-12-23 13:12:43 -08:00
Markolie 84c8b2e12b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate
# Conflicts:
#	code/game/machinery/computer/camera.dm
2016-12-23 18:58:58 +01:00
Tigercat2000 f80dae7fae Fix AI vision 2016-12-23 07:22:59 -08:00
Fox-McCloud 1e1b0d5a1f Fixes Nightvision, Darksight, and X-Ray 2016-12-23 10:06:15 -05:00
Fox-McCloud 0e2325039c Robot Component Fix 2016-12-23 08:00:36 -05:00
Fox McCloud 546f149a4f Merge pull request #5955 from athompson11/Cherrypick
Rejuvenate now properly handles broken Robot components
2016-12-23 07:53:19 -05:00
Fox McCloud 5a01a6c7d3 Merge pull request #5840 from Crazylemon64/adds_reset_perspective
Polishes up `reset_view`
2016-12-23 07:27:36 -05:00
Fox McCloud aab6715082 Merge pull request #5962 from KasparoVy/fixes-monochromatic-bugs
Refines Cloning, Fixes a Couple Genetics-related Bugs.
2016-12-23 07:19:06 -05:00
KasparoVy 3e6ea1f9f4 Removes some unnecessary redundance
Forgot to cut this out earlier. Tested without this bit of code in the
exact same way as the PR specifications and no functionality was lost.
2016-12-21 23:50:12 -05:00
KasparoVy e00814e36c Cameras Now Handle Disguises
Fixes a bug where you could take a picture of stuff behind walls (ghetto
X-Ray).
Pictures will now render people with disguises as you see them (borgs
see people with cardborg suits as borgs, people with cardborg suits see
themselves as borgs, everyone sees people carrying plants as plants)
although they will also state the person's name, regardless of disguise
(same as mouseover).
2016-12-21 22:31:13 -05:00
Crazylemon64 bed732d505 Addresses Fox's requests 2016-12-21 17:59:08 -08:00
Crazylemon64 339a187f9f Fixes vision updates such as implants and similar 2016-12-21 17:59:08 -08:00
Crazylemon64 c0cd2c263f Switches reset_view to reset_perspective 2016-12-21 17:59:08 -08:00
Crazylemon64 6d3e66f41c Polishes up the reset_view proc, which is basically
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
Crazy Lemon cf2f02e2c6 Merge pull request #5985 from Fox-McCloud/wall-rot
Wall Rot Effect Refactor
2016-12-21 17:43:45 -08:00
FalseIncarnate b0e87ea7d3 Moved/renamed controller file 2016-12-21 18:17:47 -05:00
FalseIncarnate 48cf5148f0 cleanup 2016-12-21 17:36:10 -05:00
Fox McCloud a8f6f6a0ad Merge pull request #6014 from tigercat2000/alien_fix_alt
Fix xenomorph organ surgery (properly)
2016-12-21 13:25:27 -05:00
Fox McCloud 398c3dce34 Merge pull request #5986 from tigercat2000/nano_patch_25
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-21 13:22:10 -05:00
Tigercat2000 27278ca2b1 Fix xenomorph organ surgery (properly) 2016-12-21 07:16:13 -08:00
TullyBurnalot dc225c12c3 - Removed magical arguments 2016-12-20 10:04:44 +00:00
TullyBurnalot e5c1057c7d Neurotoxin is now massive
- Neurotoxin calls newtonian_move on the user
2016-12-18 23:19:34 +00:00
Aurorablade c6c33803aa fox box airlock 2016-12-14 20:11:02 -05:00
Tigercat2000 b9abce843d NanoUI Update: Seperate UI Data into ui_data() proc
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.

To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
2016-12-14 13:37:34 -08:00
Fox-McCloud 4b1bfe33ff Wall Rot Effect Refactor 2016-12-14 13:12:10 -05:00
Crazy Lemon a46e71a874 Merge pull request #5980 from Fox-McCloud/ed-209-oversight
Fixes ED-209 Crafting Oversight
2016-12-13 22:44:58 -08:00
Fox McCloud 0e522ad809 Merge pull request #5967 from TullyBurnalot/MedBotBuckle
Medbot Buckle Fix
2016-12-13 10:38:09 -05:00
TullyBurnalot 202607acb2 Removes copypasta code 2016-12-13 15:12:55 +00:00
Fox-McCloud f43ad384d1 Fixes ED-209 Crafting Oversight 2016-12-13 09:15:03 -05:00
Aurorablade 0bb62ebb36 everything works thanks to our tiger overlords.. 2016-12-12 23:59:37 -05:00
Fox McCloud b27b85a003 Merge pull request #5966 from TullyBurnalot/ThrowPaunch
Self-Propelled Throwing Fix
2016-12-12 17:59:10 -05:00
Jonas 322e2e16bf No charge-free shooting for pods, take 2
Checks if the charge actually gets deducted from the battery, if not,
the pod weapon won't shoot
2016-12-12 13:45:38 +01:00
Aurorablade c5e6c9323b addresses mrrowl comments
still haveing shuttle load issues after first one is loaded..
2016-12-11 23:11:21 -05:00
Aurorablade 2285f40a88 ...okay soe ikea shuttles are back on new template loads 2016-12-09 22:23:12 -05:00
Fox McCloud a80b0feae1 Merge pull request #5879 from KasparoVy/glasses_handling_properly
Adds switch-layer rendering functionality for f.hair, glasses and head accessories.
2016-12-09 18:22:27 -05:00
TullyBurnalot b25f3c0452 Medbot Buckle Certification
- Medbots no longer move automatically if buckled
2016-12-09 23:19:24 +00:00
TullyBurnalot 5d93968b35 Fixes self-propelled throwing
- Throwing mobs over your back no longer pushes you as well; they just
helpfully teleport over you
2016-12-09 22:19:03 +00:00
Fox McCloud d95a679273 Merge pull request #5938 from Kyep/sit_v3
SIT/ERT Runtime fix, misc fixes
2016-12-08 21:48:50 -05:00