Commit Graph

17232 Commits

Author SHA1 Message Date
Leshana
aa8723b724 Switch tether shuttles over to self-initializing shuttle paradigm
* Deleted shuttle_controller_vr.dm as it is no longer needed.  Using standard shuttle_controller.dm again - It has no map-specific info!
* Converted the former contents of shuttle_controller_vr.dm into proper shuttle datums that self-initialize for each of our shuttles!
* Converted the tether_backup shuttle crashing mechanic to support self-initialization also.
2017-06-14 19:34:01 -04:00
Leshana
780eb637d8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170614
# Conflicts:
#	code/controllers/shuttle_controller.dm
#	code/modules/shuttles/shuttles_multi.dm
2017-06-14 17:54:34 -04:00
Anewbe
37a33fa06d Merge pull request #3522 from VOREStation/xgm-lazy-lists
XGM init() and lazy list optimization
2017-06-14 16:05:23 -05:00
Anewbe
4c6e9cd40d Merge pull request #3524 from Neerti/6/11/2017_examine_panel_update
Makes Examine Panel slightly more useful.
2017-06-14 16:04:18 -05:00
Leshana
9c32a6dc0a Fixes un-sanitized preferences runtimes
* Puts back in code that sanitized preferences after loading, it was overwritten in polaris sync commit 3f1e5c80f2
* Also removes a VOREStation Edit comment on lines that were no longer different from Polaris, introduced at the same time.
* Fixes Runtime in 02_language.dm,21: Cannot read null.language
2017-06-12 23:20:33 -04:00
Leshana
c632366c26 Fix runtimes in MouseDrop when dragging out of the screen
* MouseDrop()'s over_object may be null if dropping over a stat panel or over other empty space. Fix runtimes from assuming it is not null.
* Fixes Runtime in clothing_accessories.dm,54: Cannot read null.name
* Fixes Runtime in evidencebag.dm,21: Cannot read null.loc
2017-06-12 23:20:33 -04:00
Arokha Sieyes
671b1c27dd Merge pull request #1718 from VOREStation/aro-absorbfix
Absorbing makes people invincible
2017-06-12 10:35:40 -04:00
Arokha Sieyes
31b5d4e4db Merge pull request #1711 from VOREStation/more-qdel-fixes
More qdel fixes
2017-06-12 10:28:48 -04:00
Arokha Sieyes
f1daa0bfd5 Merge pull request #1717 from VOREStation/aro-smfix2
Two soulcatcher tweaks
2017-06-12 10:27:50 -04:00
Arokha Sieyes
f76538486f Merge pull request #1714 from VOREStation/aro-idfix
Makes people's fluff IDs get account numbers
2017-06-12 10:17:10 -04:00
Arokha Sieyes
425850f8c5 Absorbing makes people invincible
Fix, Part 2, Second Edition.

Funny, these have to be in the opposite order, becasue the type of bloodstr is the correct one and doesn't match reagents. Whoever thought of that is just the most amazing person.
2017-06-12 10:13:25 -04:00
Arokha Sieyes
b62240b945 SC list cleanup
Harder cleanup for this list so you can clear nulls if you need to.
2017-06-12 10:11:22 -04:00
Arokha Sieyes
599474a062 Makes people's fluff IDs get account numbers
Takes it from the user's mindddd.
2017-06-12 10:07:18 -04:00
Leshana
cae4b3f12c A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-11 23:48:17 -04:00
Xonkon
f99e46280d Fixed 2017-06-11 21:50:24 -05:00
Xonkon
cf7daec404 Update robot_modules_vr.dm 2017-06-11 21:33:53 -05:00
Xonkon
3c9d46d33f Buffs Medical-Hounds
Gives medical-hounds a few more toys that helps them remain relevant and do medical stuff a bit easily.
+Cyborg Hydrospray
+Larger Beaker
2017-06-11 21:25:37 -05:00
Leshana
4f138abfcc Converts Resleeving Transcore to be a subsystem
* Since the transcore has a ticker process, it really should be a subsystem.  Converted it over.  However, because its ticker is so fast, I did not bother implementing MC_TICK_CHECK into it.  Therefore it has the SS_NO_TICK_CHECK flag.
* Because its a subsystem, the global variable is now SStranscore instead of transcore.
* Because subsystems are so easy to debug, I removed the "TC" debugging variable from the machines that used it.
* Organized a few files.  The transcore subsystem is in the subsystems folder.  Defines had to be moved to defines folder so they are included first.
2017-06-11 18:32:40 -04:00
Arokha Sieyes
76edd331a3 Merge pull request #1702 from VOREStation/stonedmc-update
StonedMC Update & Hookup
2017-06-11 18:13:14 -04:00
Arokha Sieyes
0fb86b108f Merge pull request #1701 from VOREStation/aro-vorecleanup
Clean up last few verbs in Vore panel
2017-06-11 17:53:38 -04:00
Arokha Sieyes
1be95af700 Fix backup implants
Wrong args (they've always been wrong, it seems, but in a way that worked fine until now)
2017-06-11 17:29:53 -04:00
Leshana
7f60e98633 Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update
# Conflicts:
#	code/_helpers/game.dm
#	code/controllers/subsystem.dm
#	code/controllers/subsystems/garbage.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	maps/RandomZLevels/stationCollision.dm
#	maps/RandomZLevels/wildwest.dm
#	maps/~map_system/maps.dm
#	vorestation.dme
2017-06-11 15:35:42 -04:00
Arokha Sieyes
ac8bd1c69d Clean up last few verbs in Vore panel
AI, and simple animals
2017-06-11 15:01:29 -04:00
Arokha Sieyes
da78624bc1 Merge pull request #1667 from SpoopyLizz/master
Added colored eggs and did some minor tweaks.
2017-06-11 14:40:31 -04:00
Arokha Sieyes
809927c139 Merge pull request #1693 from VOREStation/aro-sleevemate
Adds the SleeveMate 3200
2017-06-11 14:39:43 -04:00
Arokha Sieyes
93888221b2 Merge pull request #1690 from VOREStation/polaris-sync-gc
tg Garbage Subsystem
2017-06-11 14:39:30 -04:00
Arokha Sieyes
7c3b3c4311 Adds the SleeveMate 3200
**This commit prevents dead people from being backup-implanted!**
But it's fine because you just use this handheld thing to back them up instead and don't waste an implant, and medical starts with 4 so don't freak out. See below.

Adds the SleeveMate 3200 hand-scanner device. This device allows you to scan people to determine several things about them:
- If they have a mind in them
- If they have a client attached
- If their mind matches their body
- If they are alive/conscious

All of that is represented with in-universe messages of course. The real function of it is that it provides several features:
- One-time mind scan: Performs a one-time mind scan for those that don't like getting mind backup implants. This will store that one scan in the database, but you'll forget everything since then if resleeved. This is also useful for resleeving someone who died without an implant, but is not DNR/DNC.
- One-time body scan: Adds someone to the body scan database, or, updates their body scan if they obtained a new body. Useful if someone has used the body designer and switched bodies, as you can update their body scan. You should probably check medical records, and LOOC around before using this to resleeve someone that didn't have a body scan originally, because they may have picked that to avoid resleeving.
- Store Whole Mind: Takes the entire mind from someone, storing it into the SleeveMate 3200, rendering the patient mindless. From there, it can be backed up as many times as needed, deleted, or stored into someone with a Soulcatcher NIFSoft and run live in their VR (so now you don't have to digest/kill people for that).

Four SM3200's start in medical (1 in minimed downstairs, 3 upstairs), R&D can fab more, and they occasionally show up in trash piles for those wanting to be sneaky with a Soulcatcher, but who don't like digesting people.
2017-06-11 13:55:04 -04:00
Neerti
18012fa1d1 Port's Bay's Shuttle Cleanup
Shuttles now set themselves up upon being instantiated instead of relying on a monolithic proc in the shuttle controller.
Shuttles can now be defined more cleanly on a per-map basis, as well.
Accidentally fixes a broken admin shuttle.
2017-06-11 11:45:31 -04:00
InterroLouis
8cefd8f702 Update custom_guns_vr.dm 2017-06-11 11:45:00 -04:00
Neerti
b7f74541b8 Makes Examine Panel slightly more useful.
The examine panel can now display different interactions with a few items, using icons, mostly as a proof of concept.
2017-06-11 02:52:53 -04:00
Leshana
e644dbe18a Destroy() cleanups in VOREStation code
* Remove remaining hard del()'s in our code.
* Replace deleted() and gcDestroyed with QDELETED macro.
* Fix some strange calls directly to Del() (capital D)
* Make Destroy() return qdel hints.
* Make a few of the Destroy()'s more comprehensive in cleaning up references.
* In edited Destroy() procs, converted to use qdel_null and qdel_null_list macros when possible for pretty code.
* Removed unused variable `sleevecard`
2017-06-10 22:44:03 -04:00
Leshana
5a02b7e5c7 More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-10 22:41:51 -04:00
Leshana
aab81abb12 Remove redundant cleanup of /atom/var/reagents
* /datum/reagents/Destroy() does everything /datum/reagents/delete() does and more, and delete() is called only from /obj/effect/Destroy() which is *itself* redundant with its parent /atom/movable/Destroy()
2017-06-10 22:41:51 -04:00
PsiOmegaDelta
7b47590645 Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
Leshana
b3fa1a6708 Merge pull request #1688 from VOREStation/aro-invinci
Fix prey becoming indigestible
2017-06-10 22:41:05 -04:00
Arokha Sieyes
869ae4dafd Fix prey becoming indigestible
And, really invincible. And runtimey. And uninjectible.
2017-06-10 22:09:27 -04:00
Leshana
0cba6a1379 Merge pull request #1685 from VOREStation/aro-scruntime
Two brains made for the price of one!
2017-06-10 21:17:22 -04:00
SpoopyLizz
e3db32fd60 hopefully fixed the problem this time 2017-06-11 02:51:29 +02:00
Arokha Sieyes
dd0ab83155 Two brains made for the price of one!
Silly.
2017-06-10 20:31:26 -04:00
Arokha Sieyes
912b60a8b3 Merge pull request #1683 from VOREStation/aro-voretab
Remove 'Vore' tab, put verbs in IC and OOC
2017-06-10 19:21:13 -04:00
Arokha Sieyes
4744914204 Merge pull request #1681 from VOREStation/aro-bsjumpsuit
Fixes for Bluespace Jumpsuit
2017-06-10 19:21:07 -04:00
Leshana
82e6049821 Actually hooks up the StonedMC to run its subsystems in Polaris
* Hooks up informing Master the gameticker actually starts and stops the round subsystems will actually fire! What ho!
* We should convert the gameticker as an MC subsystem someday, and probably completely rewrite it while we are at it becuase it is crazy.  But this should bridge the gap until then.
2017-06-10 19:01:58 -04:00
Arokha Sieyes
2d92c8c2fb Remove 'Vore' tab, put verbs in IC and OOC
OOC Escape goes to OOC obviously, Vore Panel is now the last thing in the IC tab.
2017-06-10 18:45:13 -04:00
Arokha Sieyes
a3b8fa3949 Merge pull request #1682 from VOREStation/aro-scruntime
Fix a runtime I missed on Soulcatcher
2017-06-10 18:29:06 -04:00
Arokha Sieyes
fe72397283 Merge pull request #1677 from Yoshax/customtaurcoat
Add's Epic_Charger's custom taur winter snow suit
2017-06-10 18:28:56 -04:00
Anewbe
5d81148ab8 Merge pull request #3511 from VOREStation/garbage-subsystem
tg Garbage Subsystem
2017-06-10 17:20:22 -05:00
Arokha Sieyes
f3983db0f7 Fix a runtime I missed on Soulcatcher
Only affects erasing minds, and doens't affect the prey, really. Just means the minds count is wrong and the name sticks around.
2017-06-10 18:11:33 -04:00
Arokha Sieyes
118d035c4e Fixes for Bluespace Jumpsuit
Oddly sets your size to null, no idea where it happens, but have some safety checks.
2017-06-10 18:09:44 -04:00
Anewbe
1ace6311a8 Merge pull request #3520 from VOREStation/aro-pol-gmob
Greases up get_blahblah_fast
2017-06-10 15:56:28 -05:00
Arokha Sieyes
389aba627c Merge pull request #1679 from VOREStation/aro-sclogging
Soulcatcher chat logging, and subtle logging for free
2017-06-10 15:29:09 -04:00