Commit Graph
7183 Commits
Author SHA1 Message Date
Crazylemon64 ec0f13d41e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:01:43 -08:00
Crazy LemonandGitHub 97efbba455 Merge pull request #6060 from Kyep/pipe_icon_fix
Fixes #5097 - out-of-date vent/scrubber images
2017-01-06 02:42:59 -08:00
Fox McCloudandGitHub d7bda7b415 Merge pull request #6051 from Crazylemon64/pai_ui_fix
Fixes pAI UIs
2017-01-06 03:08:27 -05:00
Crazy LemonandGitHub 7e0183f23f Merge pull request #5224 from Kyep/jobs_unlock_system
Playtime Tracking
2017-01-03 18:06:28 -08:00
Kyep 9b008e6635 Improvement 2017-01-02 03:40:14 -08:00
Kyep 05abbca455 Fixes webspam issue 2017-01-01 03:33:13 -08:00
Crazy LemonandGitHub 19e923eaa2 Merge pull request #5570 from Kyep/terrorspiders2
Basic Terror Spiders
2016-12-31 23:41:23 -08:00
Crazylemon64 06ad22f4b7 pAI software now no longer infiniloops 2016-12-31 13:03:06 -08:00
Crazylemon64 f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08:00
Crazylemon64 6ea4788cb7 death to on_ui_interact 2016-12-31 12:40:52 -08:00
Crazylemon64 9273399f89 Splits out ui_data and ui_interact of pAIs
Doesn't actually make it work, though
2016-12-31 12:12:35 -08:00
Crazylemon64 c1bf541ee7 Removes pAI software relpathing 2016-12-31 10:18:04 -08:00
Kyep d62038a336 Crazylemon Changes
1) Changed \ref and ..() per Crazylemon's request
2) Fixed a bug with Life() that was causing regeneration not to work
2016-12-29 23:41:32 -08:00
Aurorablade fc71122914 fixes
Barring any errent merge conflict fixing fuckery.
2016-12-29 11:39:18 -05:00
Aurorablade 98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
# Conflicts:
#	code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
Aurorablade 9e3ccc8405 I hate when ti does this 2016-12-29 10:36:42 -05:00
Aurorablade dd75048969 well hopefully last conflict fix with shuttle merger 2016-12-29 10:33:48 -05:00
Mieszko Jędrzejczak b2640032d6 Fixes AIs being blind after a power outage. 2016-12-28 22:28:54 +01:00
Kyep c29fd56fc7 Deletes Tvtropes links :( 2016-12-24 00:37:14 -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
Crazylemon64 526335a9b6 Paper hats and bandanas no longer runtime on {un,}equip 2016-12-23 17:19:50 -08:00
Crazy LemonandGitHub 11311b1c18 Merge pull request #6018 from Fox-McCloud/refactor-fix
Fixes Nightvision, Darksight, and X-Ray
2016-12-23 13:12:43 -08: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 McCloudandGitHub 546f149a4f Merge pull request #5955 from athompson11/Cherrypick
Rejuvenate now properly handles broken Robot components
2016-12-23 07:53:19 -05:00
Fox McCloudandGitHub 5a01a6c7d3 Merge pull request #5840 from Crazylemon64/adds_reset_perspective
Polishes up `reset_view`
2016-12-23 07:27:36 -05:00
Fox McCloudandGitHub 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
Kyep b253a93484 Fox requests 2016-12-22 02:09:21 -08: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
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
Fox McCloudandGitHub 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
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
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 McCloudandGitHub 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 McCloudandGitHub b27b85a003 Merge pull request #5966 from TullyBurnalot/ThrowPaunch
Self-Propelled Throwing Fix
2016-12-12 17:59:10 -05:00
Kyep 0d4ae037ab More Tiger Requests 2016-12-09 22:43:13 -08:00
Fox McCloudandGitHub 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
Aurorablade d9758cf31e Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-12-09 16:50:29 -05:00
Kyep 548381e830 Tiger-requested changes 2016-12-08 22:55:40 -08:00
Fox McCloudandGitHub def08f87ed Merge pull request #5943 from Kyep/cryo_mechparts
Fix for medbay cryo never auto-ejecting patients with mech limbs
2016-12-08 19:03:25 -05:00
KasparoVy b22c97293a Refines Cloning, Fixes a Couple Genetics-related Bugs.
Characters will now be correctly assigned their species' genetic quirks at spawn.
Cloning will now correctly assign a characters species' genetic quirks.
Changing a character's species (via C.M.A. or whatever might call the set_species proc) will now correctly assign their species' genetic quirks.
2016-12-07 20:24:06 -05:00
Aurorablade 81e740e6e5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-12-06 21:51:53 -05:00