Commit Graph

7196 Commits

Author SHA1 Message Date
uraniummeltdown f35f52b89a added mime names from TG, mimes can now pick name on entry 2017-01-08 15:45:14 +04:00
Fox McCloud bc64b2991b Merge pull request #6067 from KasparoVy/gr-ayy
Improves Grey Sprites, Fits Tattoo Sprites to their Body, Last Vox Tattoo
2017-01-06 12:47:42 -05:00
Fox McCloud 90fa552a2e Merge pull request #6062 from Crazylemon64/resting_tweak
Waking up no longer auto-cancels resting
2017-01-06 12:45:51 -05:00
Crazy Lemon af0c8e888a Merge pull request #4392 from Aurorablade/BookClub
Book Club Refactor/butchering
2017-01-06 05:55:01 -08:00
Crazylemon64 4a914c2a23 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:15:11 -08:00
Fox McCloud 4f86cee581 Merge pull request #6053 from Crazylemon64/secure_buckles
Shuttles no longer disable buckling
2017-01-06 08:14:22 -05:00
Fox McCloud e17939388b Merge pull request #6065 from Crazylemon64/nullprefs_logging
Safeguards against null-prefs clients from muting everyone
2017-01-06 08:10:37 -05:00
Crazylemon64 ec0f13d41e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:01:43 -08:00
Crazy Lemon 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 McCloud d7bda7b415 Merge pull request #6051 from Crazylemon64/pai_ui_fix
Fixes pAI UIs
2017-01-06 03:08:27 -05:00
Crazy Lemon 7e0183f23f Merge pull request #5224 from Kyep/jobs_unlock_system
Playtime Tracking
2017-01-03 18:06:28 -08:00
KasparoVy 4e594e8fed Vox Tiger-stripe Tattoo 2017-01-03 10:09:53 -05:00
KasparoVy 784056dc42 Resolves some Grey spriting issues.
Removes some mystery pixels and tidies up the Grey sprite a bit.

Fits tattoo markings to Grey bodies. Let the ink flow.

Greys still need to be sprite-fitted for all suits, headwear, eyewear,
facewear and uniforms.
2017-01-03 04:42:13 -05:00
Crazylemon64 ba08f54f08 Adds a wrapper proc that makes the null prefs datum bug not kill talking
A null prefs datum is still logged, so that we are able to isolate the
source of the problem, though
2017-01-02 19:26:30 -08:00
Crazylemon64 2e7346af69 Waking up no longer auto-cancels resting 2017-01-02 12:04:51 -08:00
Kyep 9b008e6635 Improvement 2017-01-02 03:40:14 -08:00
Crazylemon64 ff91d4818a Picky nits 2017-01-01 21:53:31 -08:00
Crazylemon64 d79c42fa1e Shifts the checking procs to appropriate regions 2017-01-01 21:46:55 -08:00
Kyep 05abbca455 Fixes webspam issue 2017-01-01 03:33:13 -08:00
Crazy Lemon 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 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
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
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 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
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