Commit Graph

17190 Commits

Author SHA1 Message Date
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
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
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
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
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
Arokha Sieyes
a634b483ef Merge pull request #1674 from VOREStation/aro-qntweak
Quick NIF verb tweak
2017-06-10 15:28:58 -04:00
Arokha Sieyes
19c7aec39b Merge pull request #1671 from VOREStation/polaris-sync-20170609
Polaris sync 20170609
2017-06-10 15:28:43 -04:00
Arokha Sieyes
272eb2ff4f Merge pull request #1668 from VOREStation/aro-roundquit
Adds 'Quit This Round' verb for ghosts
2017-06-10 15:28:29 -04:00
Arokha Sieyes
cd29b7de86 Soulcatcher chat logging, and subtle logging for free
Logs soulcatcher messages to the chat log so admins can review them, since that's kinda important, and gives subtle it's own logging format so you can tell it's a subtle and not just an emote. Also disables subtles while in the soulcatcher because apparently that was a thing.
2017-06-10 14:57:32 -04:00
Spades
19c8a43db8 Merge pull request #1669 from Cameron653/master
Allows rigsuits to be able to carry backpacks
2017-06-10 14:38:43 -04:00
Yoshax
73fda854cf Add's Epic_Charger's custom taur winter snow suit 2017-06-10 18:18:20 +01:00
Arokha Sieyes
878d3597fc Quick NIF verb tweak
Use this list instead? The other one appears to contain... something else. Or be misaligned or something.
2017-06-10 03:37:01 -04:00
Leshana
ad6bea591a Put lighting range back how it was for now.
* The Polaris change of reducing light fixture range is interesting! But we need to work on how it plays out on our map before adopting it.
2017-06-09 23:40:22 -04:00
Arokha Sieyes
c9595f5ba8 Adds 'Quit This Round' verb for ghosts
This verb frees your job slot, removes you from the manifest, and removes your mind/body records so you can't be resleeved (if you do this sooner than 15 minutes, medical will not be nodified of your demise). This prevents you from respawning as that character (you can play any other character if you want).

**People should start using this**, it's really helpful to people who want to play your job if you're not coming back. Just use it if you're done for the day, or want to switch characters, or whatever.
2017-06-09 23:05:48 -04:00
Cameron653
99f54b480c Allows rigsuits to be able to carry backpacks
Because it was removed for some reason
2017-06-09 23:04:00 -04:00
Leshana
69a50ec225 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609
# Conflicts:
#	code/_macros.dm
#	code/controllers/master_controller.dm
#	vorestation.dme
2017-06-09 22:54:16 -04:00
Arokha Sieyes
4c3993df65 Merge pull request #1665 from VOREStation/aro-bshtweaks
Couple more BSH Tweaks
2017-06-09 20:06:11 -04:00
Arokha Sieyes
d10bb26cd6 Merge pull request #1664 from VOREStation/aro-fluffloss
Remove a bunch of my fluff items
2017-06-09 20:06:03 -04:00
Arokha Sieyes
376feb9bcd Merge pull request #1660 from VOREStation/aro-scimprovements
Soulcatcher improvements
2017-06-09 20:05:18 -04:00
Arokha Sieyes
f88ac10362 Couple more BSH Tweaks
No more harpooning into walls to walk into areas you can't see because that's stupid. You can't harpoon turfs with dense objects on them.
2017-06-09 19:52:18 -04:00
Arokha Sieyes
a22e9e70aa Remove a bunch of my fluff items
We're going to start limiting them to certain jobs and such. Too many people have too many mechanically superior-to-normal-stuff fluff items. So let this be an example that it's not some sorta thing we're doing to be mean.
2017-06-09 19:41:13 -04:00
Arokha Sieyes
4344c285a6 Merge pull request #1654 from Verkister/master
Longpup mobs! (plus an approved fluff item committed earlier)
2017-06-09 19:31:50 -04:00
Arokha Sieyes
9e51ba2fa3 Soulcatcher improvements
- Multiple minds at once, gotta catch 'em all, they can all talk to each other, etc
- A setting to enable mind backups for all minds in there like an implant
- Notifications to the already-in-there minds when one comes or goes
- If YOU get put in YOUR soulcatcher, it does ONE backup right then and stops, so medical will be notified
2017-06-09 19:09:55 -04:00
Arokha Sieyes
bcb44367ba Merge pull request #1658 from VOREStation/aro-tport
Fix Bluespace Harpoon bug, Allow Teleport Jamming
2017-06-09 15:45:28 -04:00
Arokha Sieyes
c486421c3c Merge pull request #1657 from VOREStation/aro-qnmsgs
Don't message on Quick NIF twice
2017-06-09 15:45:21 -04:00
Arokha Sieyes
a4208cc40c Merge pull request #1656 from VOREStation/aro-nifwatch
Don't let people skip NIF install time with cryo
2017-06-09 15:45:14 -04:00
Arokha Sieyes
39bc45b5e0 Merge pull request #1655 from VOREStation/aro-bsjs
Bluespace Jumpsuit and remove arbitrary size changing
2017-06-09 15:45:06 -04:00
Arokha Sieyes
78594376f1 Fix Bluespace Harpoon bug, Allow Teleport Jamming
The subspace jammers will jam portable teleporters (not the hand tele, for ~reasons~ (mostly to give it one good feature)). This should also fix an annoying bug where the bluespace harpoon fails to work for a long period of time.
2017-06-09 15:32:25 -04:00
Arokha Sieyes
7441631254 Don't message on Quick NIF twice
It's annoying!
2017-06-09 15:26:22 -04:00
Arokha Sieyes
cdfe97d9c7 Don't let people skip NIF install time with cryo
Tsk tsk.
2017-06-09 14:05:22 -04:00
Verkister
8db768e63d Snowflake stuff. 2017-06-09 20:48:33 +03:00
Verkister
bda3a830f5 Some cleanup stuffs. 2017-06-09 20:22:07 +03:00
Arokha Sieyes
952265036f Bluespace Jumpsuit and remove arbitrary size changing
The bluespace jumpsuit is relatively cheap (compared to a shrink ray) and craftable in R&D. When worn, it allows you to resize yourself at will, and when removed you'll snap back to your original size (use a shrinkray or the Mass Altering NIFSoft for permanent changes). The reason it's not permanent is because it's very cheap to make in R&D, really. No mining materials needed, but it only affects you. So you can consider it the 'minor' size change tool.

This PR also comments out the arbitrary size change verb since we decided to remove it, as it was being used to generally just make 'magic' characters that could resize themselves at will, or use it for mechanical purposes to avoid being shot etc when fighting starts, even though it says specifically not to do these things. If you want such a character that can resize themselves due to their physiology, please apply for an SCA and we can give you a small fluff item or other accomidation to allow such a thing.
2017-06-09 11:51:29 -04:00
Verkister
762bfa7649 Longpup mobs!
-plain and just hostile version
-recruitable follower pet version that starts hostile but has a 50% chance of taming and befriending on petting.
-same as above but with a collar
-guard puppy version that comes tame by default, runs after criminals, and has the 50% chance of befriending and following.
2017-06-09 18:34:03 +03:00
Arokha Sieyes
2f3b56467c Minor NIF and Soulcatcher Tweaks
- Brainmob can understand galcom so they can understand radio announcements if they're allowed to hear things.
- Adds admin verb in Fun tab for "Quick NIF" to quickly implant someone with a NIF, if for example they lost theirs via bug, or for antags in events.
- Some tweaks in Persist VR to not 'hard crash' just in case runtiming prevents other things.
- Added titles to top of *nsay and *nme boxes so you can remember what you're doing.
2017-06-09 10:16:45 -04:00
Arokha Sieyes
7ee54f8186 Merge pull request #1650 from VOREStation/aro-surgery
Surgery and syringe fixes
2017-06-09 02:43:12 -04:00
Arokha Sieyes
0f251a88ff Merge pull request #1648 from Yoshax/tailsandcolors
Fixes some colourisation issues
2017-06-09 02:43:07 -04:00
Arokha Sieyes
c76ff74c54 Merge pull request #1646 from VOREStation/aro-freedom
NIF Fixes and Soulcatcher NIFSoft, Money Tweak
2017-06-09 02:42:58 -04:00
Arokha Sieyes
6d58df9f60 Surgery and syringe fixes
Fixes a line printed about staying close to your patient printed in error, and makes syringes work on laying patients again.

The do_surgery overrides are from a bygone era.

Tested == yes
2017-06-09 02:11:23 -04:00
Arokha Sieyes
a208283706 Surgery and syringe fixes
Fixes a line printed about staying close to your patient printed in error, and makes syringes work on laying patients again.

The do_surgery overrides are from a bygone era.

Tested == yes
2017-06-09 02:10:09 -04:00