Commit Graph

20029 Commits

Author SHA1 Message Date
Aronai Sieyes
d0fbc58100 Merge pull request #3145 from VOREStation/aro-nifexamine
Readds NIF examine text
2018-02-27 21:38:25 -05:00
Aronai Sieyes
91c08edf70 Merge pull request #3133 from VOREStation/exp-turfs-overlays
Convert turfs to use add_overlays()
2018-02-27 21:31:35 -05:00
Arokha Sieyes
66f2acb931 Handle NIF examine saving string vs null 2018-02-27 19:22:31 -05:00
Aronai Sieyes
1fd65b1854 Merge pull request #3138 from VOREStation/Cameron653-patch-1
Gives prometheans the trash eater trait.
2018-02-27 18:57:47 -05:00
Cameron653
c34cf7000e Gives them the trash eater command 2018-02-27 17:34:05 -05:00
Aronai Sieyes
dcb29aec67 Merge pull request #3140 from Heroman3003/handytry
New Handy sprites for non-dog borg modules
2018-02-27 14:07:32 -05:00
Arokha Sieyes
c4af5850d1 Readds NIF examine text
Recoded it a little different. The verb is in OOC, if you have a NIF. It's saved as part of the NIF, so if your head explodes and you lose your NIF, you'll need to describe your new one.

Also fixes an unrelated bug where ghosts examining people print all sorts of crazy messages about being able to trample people.
2018-02-26 20:27:13 -05:00
Heroman3003
55121258bc Fixed some funky code. 2018-02-27 07:59:33 +10:00
Leshana
7483ede4d2 Merge pull request #3127 from Cyantime/patch-2
Fixes vasilissan flags
2018-02-26 02:35:13 -05:00
Heroman3003
d077d0239c Added mining, security and standard Handies (for full set) 2018-02-26 14:33:12 +10:00
Heroman3003
5dd6e79421 fixed blinking of new sprites properly 2018-02-26 11:26:11 +10:00
Heroman3003
22103c05e4 fixed blinking of new sprites 2018-02-26 11:20:32 +10:00
Heroman3003
6407ded832 dog sprites won't disappear now 2018-02-26 08:28:14 +10:00
Heroman3003
970dc7fd3c Added new Handy sprites and possibility for new ones 2018-02-26 05:25:23 +10:00
Cameron653
cccec497e3 Gives prometheans the trash eater trait. 2018-02-25 12:02:11 -05:00
Leshana
00f8ae5cd8 Convert turfs to use add_overlays(), eliminating the turf_overlay_holder!
- Converted as much as I could find about turf overlays to use add_overlay().
- This should be enough to stop BYOND from crashing, so we can eliminate the turf_overlay_holder hack.
- This also lets us remove the anti-corruption hacks from walls and open space.
- ZAS gas overlays can use priority overlays, so this also fixes the gas-goes-away-when-crowbarring-plating issue.
- Stuff like that
2018-02-25 02:02:57 -05:00
Layla Crosse/Occula Drenn
08291c5b6b FIXES GAZER BEING DUMB YET AGAIN
***EVERY TIME IT'S SOMETHING***
2018-02-24 21:47:04 -05:00
Anewbe
86e45005bd More accessory runtimes and bugfixes 2018-02-24 20:02:55 -05:00
Anewbe
ff2496a2e6 Should be able to attach accessories by clicking the target item again 2018-02-24 20:02:38 -05:00
Aronai Sieyes
325d05317a Merge pull request #3126 from VOREStation/exp-ss-overlays
Port SSoverlays
2018-02-24 19:36:36 -05:00
Aronai Sieyes
436e0e8071 Merge pull request #3120 from VOREStation/aro-saremov
Remove unnecessary SA code
2018-02-24 19:28:44 -05:00
Leshana
592208dc38 Merge pull request #3125 from VOREStation/aro-comlinkdest
Fix commlink runtime
2018-02-24 19:23:46 -05:00
Cyantime
878e5b71d5 Fixes vasilissan flags 2018-02-25 00:11:23 +00:00
Arokha Sieyes
484e44c161 POLARIS: Only spam ghosts with chat messages from things with real clients 2018-02-24 18:51:30 -05:00
Leshana
fef30da831 Upgrades NSFW to use initialize() and SSoverlays
- Both as a first demonstration and as a practical bugfix, we upgrade the NSFW to use SSoverlay.   Instead of building a mutable_apperance and assigning it, we cut_overlays(), make our images, and call add_overlay() to queue it for compiling.
- We also must convert from using New() to initialize() becuase for annoying BYOND reasons,  some static variables in SSoverlays are not always instantiated before mapload.  So its important not to call overlays functions from New()  (We shouldn't be doing that ANYWAY for performance reasons, but now its even more true)
2018-02-24 18:33:53 -05:00
Leshana
f2f630fa89 Ported the core of the overlays management subsystem from /tg
- Added SSoverlays subsystem for compiling overlay lists and applying them to atoms in a controlled anti-lag subsystem.
- Added vars and procs to atom which should eventually replace all direct interaction with BYOND's /atom/overlays var outside the subsystem.
- Added OVERLAY_QUEUED flag to var/atom/flags bitfield.
- Added small framework for subsystem performance tracking. So far used only by SSoverlays
- Added admin debug command "Display overlay Log" to see performance stats mid-round.
2018-02-24 17:40:35 -05:00
Leshana
9b36c4da49 Added "Display Initialize() Log" admin debug command so you can see it mid-round. 2018-02-24 17:36:27 -05:00
Arokha Sieyes
16d2dfe333 Fix commlink runtime
Probably when NIF is being destroyed.
2018-02-24 17:19:49 -05:00
Layla Crosse/Occula Drenn
7bab64577b Adds Gazer's hairmaw thing for his snowflake character
Related App: https://forum.vore-station.net/viewtopic.php?f=45&t=1273&sid=f66aadf7535f19fda0a5689a65750ebc
2018-02-24 15:59:44 -05:00
Arokha Sieyes
0d66593e14 Remove unnecessary SA code
They sleep in life() when nobody is around now
2018-02-24 14:53:53 -05:00
Aronai Sieyes
f29484f8da Merge pull request #3117 from VOREStation/aro-fbpcells
Adds a synth backup cell to synth survival box, plus goggles
2018-02-24 14:43:48 -05:00
Aronai Sieyes
40357862f3 Merge pull request #3113 from VOREStation/aro-SIXHOURSAAAAHHHH
Adds a generic 'aura animation' system, applies to resizing
2018-02-24 14:43:35 -05:00
Aronai Sieyes
f6d65ec0b8 Merge pull request #3114 from VOREStation/aro-matweak
Tweak MA constructor
2018-02-24 14:43:26 -05:00
Arokha Sieyes
581f239bfd POLARIS: FBP backup battery cells for survival purposes
Usable with <= 100 nutrition, adds 100 nutrition.
2018-02-24 14:14:21 -05:00
Leshana
4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24
# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm
2018-02-24 13:19:10 -05:00
Anewbe
74a4e993ee Merge pull request #4939 from Anewbe/accessories
Should fix an accessories oversight
2018-02-24 11:29:50 -06:00
BillyBangles
475d250d6a adds slippery ice tiles (#4935) 2018-02-24 11:04:58 -06:00
elgeonmb
4e9aaf230c adds new article, adds old article we forgot to add (#4934)
* adds new article, adds old article we forgot to add

* pesky typo
2018-02-24 11:03:39 -06:00
Anewbe
5b0aac2a91 Merge pull request #4933 from VOREStation/vplk-macro-qol
Create client preference for if hotkey mode is enabled by default on login
2018-02-24 11:03:03 -06:00
Anewbe
2553edc2a0 Merge pull request #4932 from VOREStation/pol-box2
Small tweak to survival boxes
2018-02-24 11:02:07 -06:00
Schnayy
8ccf0f7532 AlliCo Hallmark Goods (#4887)
* Adds the gift vendor, AlliCo Hallmark Goods, ran the name by Elgeon beforehand. Is a delightfully gaudy vending machine placed in the locker rooms. The coffee machine was removed and the sweatmax moved to take it's place so the gift vendor is next to the laptop and cigarette vendors. Prices were based off of the SweatMax vendor.

Before: https://i.gyazo.com/0d6758fc8a469fea6e340b5937b95f82.png
After: https://i.gyazo.com/ab21b6ff7ed012786d475b71f1ec180e.png

Vendor will normally dispense:
- Heart box chocolates
- Bouquets
- Cheaper fake bouquets
- Each of the 4 cards previously added.
- All the therapy dolls.

Will dispense the following with a coin:
- All small plushies
- Newly added trinket box.

Will dispense the following when hacked:
- Gilthari Luxury Champagne
- Plans to add a handbuzzer in the future but not right now.

Items & Reagents added:

- Champagne. Is not a mixable reagent, listed as a child of wine.
- Gilthari Luxury Champagne. Contains said reagent.
- Trinket box. Think an engagement ring box, except it can also hold coins and medals. May be toggled open/closed, when opened it's description will say what's inside. Can only hold one item. Thanks to Mechoid for helping me code this mess. https://i.gyazo.com/7a16faada015ef0795a4db2ec6429e68.png
- Also goes in and fixes a small bug with the heart box saying it contains donuts when it does, in fact, not contain donuts.

Side note, mapping things in is scary!!!

* In the process of fixing the map merger nonsense w/ mechoid's help.

* We're almost there lads.

* If this doesn't work I'll cry.

* Changes name to AlliCo Baubles and Confectioneries, fixes conflict (hopefully), and adds friendship bracelets to vendor.

* REVERTING ITEMS.DMI. Attempting to fix conflict.

* Recommitting items.dmi

* One last attempt to fix the conflict before I make some bigger changes to get this through.

* Removed conflicting file and committed out calls on the sprite. Will readd in separate PR.

* now with 20% less silly
2018-02-24 11:01:23 -06:00
Arokha Sieyes
d68629fc80 VS: MA override removal changes 2018-02-24 11:44:57 -05:00
Arokha Sieyes
9bc7510e26 POLARIS: Tweak weird MA override
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
2018-02-24 11:44:57 -05:00
Aronai Sieyes
a43acad170 Merge pull request #3082 from VOREStation/BEYONDMYLIFE_FLUFF_ITEMS
Adds BeyondMyLife's custom clothes
2018-02-24 11:16:36 -05:00
Aronai Sieyes
13dec153ff Merge pull request #3110 from VOREStation/Cameron653-patch-2
Removed unused fat genetics movement code
2018-02-24 11:16:18 -05:00
Arokha Sieyes
c99bf87547 VS: Make resizing use the aura animations 2018-02-24 11:01:36 -05:00
Anewbe
12015d7f5a Merge pull request #4915 from MisterLayne/slimebaton_dropper
Slimebots drop the right baton.
2018-02-23 23:44:50 -06:00
Anewbe
99312f323d Should fix an accessories oversight 2018-02-23 22:22:53 -06:00
Leshana
30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-02-23 21:55:42 -05:00
Leshana
4457c2ffd2 Merge pull request #3111 from VOREStation/aro-say2
say() safety check on client
2018-02-23 18:06:59 -05:00