Commit Graph

20258 Commits

Author SHA1 Message Date
Repede
a4202ec1d6 Implemented basic GLOB and TGS3's DMAPI 2018-02-27 18:31:13 -05:00
Repede
d6889dbdcf Merge branch 'master' of https://github.com/VOREStation/VOREStation 2018-02-26 19:36:57 -05:00
Leshana
7483ede4d2 Merge pull request #3127 from Cyantime/patch-2
Fixes vasilissan flags
2018-02-26 02:35:13 -05:00
Kelshark
57148a5718 Fixed Chemistry-Holder.dm not being the same as upstream for strange reasons. 2018-02-25 16:04:58 -05:00
Kelshark
9bb51e45e4 Merge branch 'master' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/machinery/vending.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	icons/obj/mining.dmi
2018-02-24 22:51:59 -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
Arokha Sieyes
fc3aca384a say() safety check on client
Spawn keeps it from destroying all say(), thankfully, but needs to be fixed.
2018-02-23 15:56:16 -05:00
killer653
641348c744 BeyondMyLife's custom fluff items 2018-02-23 15:10:35 -05:00
Cameron653
9bf341d199 Removed unused fat genetics movement code
You can't get it in the game anyways w/o admin abuse. No reason to have an extra  if() check.
2018-02-23 14:18:36 -05:00
Anewbe
63667c4a02 Merge pull request #4927 from VOREStation/pol-gun
Fix mode_name on guns always being null
2018-02-23 13:18:36 -06:00
Anewbe
b58b4fcfde Merge pull request #4928 from VOREStation/pol-join-order
Create humans ON their spawn points
2018-02-23 13:18:28 -06:00
Anewbe
328a7c54df Merge pull request #4926 from VOREStation/vplk-gas-turbine
Make gas turbine constructable and operational
2018-02-23 13:16:56 -06:00
Leshana
1d11b0d6e1 Create client preference for if hotkey mode is enabled by default on login or not.
* Adds preference setting for wether hotkeys should default to enabled or disabled.
* Fixes bug for CTRL+NUMPAD8 using old verb name for toggling head.
2018-02-23 14:16:53 -05:00
Anewbe
849ef9a8d6 Merge pull request #4925 from VOREStation/vplk-tesla-grounding
Tweak Tesla Grounding Rods
2018-02-23 13:16:46 -06:00
Arokha Sieyes
9e20ead03a Small tweak to survival boxes
Synths start with a unique empty type rather than just an unnamed cardboard box, and don't get a tank or the comprehensive supplies (the only useful thing would be the glowstick, but there are a billion of those).
2018-02-23 11:51:11 -05:00
Aronai Sieyes
210c16590a Merge pull request #3107 from VOREStation/aro-kinscoop
SA's with hands can scoop mobs
2018-02-23 00:22:38 -05:00
Aronai Sieyes
72335bb82b Merge pull request #3105 from VOREStation/aro-zshadfix
Zshadows should be as invisible as their origin
2018-02-23 00:07:19 -05:00