Commit Graph

14611 Commits

Author SHA1 Message Date
Markolie
e2587dbbbf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm
2016-12-23 19:04:35 +01:00
Tigercat2000
f80dae7fae Fix AI vision 2016-12-23 07:22:59 -08: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
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
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
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
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
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
Fox McCloud
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
Fox McCloud
a2e29e7512 Merge pull request #5960 from TullyBurnalot/RedemptionConvention
ORM/Mining Vendor Unpowered Fixes
2016-12-07 13:10:03 -05:00
TullyBurnalot
1afdfe3933 Adresses the forceMove(src)
- See above title
2016-12-07 18:03:45 +00:00
Fox McCloud
287226fa19 Merge pull request #5858 from Markolie/grammarnazi
Verb category changes, telecoms verb fix
2016-12-07 12:33:36 -05:00
Markolie
88946a0b77 Switching karma back to the "OOC" tab 2016-12-07 16:52:10 +01:00
TullyBurnalot
e23b10081e Maintanability of powered checks
- Powered check no longer blanket bans everything but deconstruction
2016-12-07 12:45:57 +00:00
TullyBurnalot
d865b601d8 Unpowered Mining Machine Deconstruction
- Both the Mining Vendor and the ORM can now be deconstructed when
unpowered
2016-12-07 11:17:34 +00:00
TullyBurnalot
a2bde2d187 Mining Vendor no longer gobbles up IDs
- When unpowered, Mining Vendors no longer accept IDs
2016-12-07 10:51:43 +00:00
athompson11
806e745635 Rejuvenate now properly handles broken Robot components
Fixes #5953 by giving the robot mob an override for rejuvenate that
fixes broken components.
2016-12-06 09:50:43 -06:00
Mieszko Jędrzejczak
ddb1e83d1d Adds floof 2016-12-06 11:42:10 +01:00
Kyep
d5e3e14dc9 Requested changes
- Creates "has_organic_damage" proc and updates cryopod and medibot to
use it.
- For non-human mobs, this proc returns 1 for damaged mobs and 0 for
full-health mobs.
- For human mobs, this proc returns 1 for mobs with damage to organic
parts, and 0 for mobs that are either full health, or have only got
damage to robotic limbs.
2016-12-05 14:21:32 -08:00
Fox McCloud
029133a9ad Merge pull request #5945 from Markolie/aieye
[s]Fix AI static exploit
2016-12-04 16:02:50 -05:00
Markolie
8b2933b0a1 Fix AI static exploit 2016-12-04 20:03:17 +01:00
Kyep
945225b6e8 Runtime & bug fixes
- Fixes a runtime in preferences.dm created by the Patreon PRs,
triggered when an ERT, SIT, or any other clientless mob uses
"var/datum/preferences/A = new()".
- Fixes a bug where, if a SIT is spawned with the 'choose manually'
option, one fewer person than intended is pulled in.
- Fixes syndicate headset not being included in the SIT member's notes.
- Deletes commented code.
2016-12-03 06:24:47 -08:00
Crazy Lemon
51822ab940 Revert "Revert "Makes the admin logout tracking system actually work"" 2016-12-03 02:23:18 -08:00
Crazy Lemon
c8f54b4d53 Revert "Makes the admin logout tracking system actually work" 2016-12-03 01:53:47 -08:00
Crazy Lemon
6a06a9862f Merge pull request #5895 from Kyep/erpwarningfix
ERP Warning Fix
2016-12-03 00:40:53 -08:00
Crazy Lemon
5b9375e312 Merge pull request #5917 from Crazylemon64/admin_logout_notify_fix
Makes the admin logout tracking system actually work
2016-12-03 00:40:09 -08:00
Fox McCloud
cf57887f88 Merge pull request #5914 from KasparoVy/fixes-the-pictures
Tails/body accessories now render properly in ID card photos, 'HD' Char. Preview Icon
2016-12-01 10:18:25 -05:00
Fox McCloud
f205f5f040 Merge pull request #5915 from Twinmold93/runtime_fixer_t2
Spacepod and Some Runtime Fixes
2016-12-01 10:15:51 -05:00