Commit Graph

1289 Commits

Author SHA1 Message Date
Aronai Sieyes
72f239b2ac Makes pregame time a config setting
Boo hardcoded values
2020-03-08 01:05:28 -04:00
Atermonera
217dabd31c Merge pull request #6789 from VOREStation/pol-busysignal
Moving AI busy check so it's performed less and more centrally
2020-03-05 15:14:36 -05:00
Leshana
c837078105 Replaced "area" shuttles with "landmark" shuttles.
Largely ported from the work done at Baystation in https://github.com/Baystation12/Baystation12/pull/17460 and later commits.

 - Shuttles no longer require a separate area for each location they jump to.
   Instead destinations are indicated by landmark objects, which are not necessarily exclusive to that shuttle.
   This means that more than one shuttle could use the same docking port (not at the same time of course).
 - Enhanced shuttle control computers to use nanoui if they didn't.
 - Organizes shuttle datum code a bit better so there is less re-inventing the wheel in subtypes.
 - Allows the possibility of shuttles (or destinations) that start on late-loaded maps.
 - Deprecate the "extra" shuttle areas that are no longer needed and update shuttle areas in unit tests

This all required a bit of infrastructure improvements.

 - ChangeArea proc, for changing the area of a turf.
 - Fixed lighting overlays actually being able to be destroyed.
 - Added a few utility macros and procs.
 - Added "turf translation" procs which are like move_contents_to but more flexible.
2020-03-05 10:29:08 -05:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Hawk_v3
f2b8f92b63 Merge remote-tracking branch 'upstream/master' into releaseupdate 2020-03-02 17:55:11 +00:00
Aronai Sieyes
6af54bfec2 NanoUI Subsystem Fixes
Don't do this, the asset subsystem does this for you
2020-03-01 14:14:52 -05:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
2020-03-01 12:35:52 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase
VChat: Redone chat output in Vue.js
2020-03-01 10:51:29 -05:00
Atermonera
1d4d3afd45 Merge pull request #6756 from Neerti/lightning_fixes
Fixes various lightning strike bugs
2020-02-27 23:58:36 -05:00
Atermonera
772a95c68e Adds an In-game Feedback System 2020-02-24 16:35:08 -05:00
Leshana
3c03a71107 Investigate what causes us to bail out early when timer system breaks. 2020-02-23 00:42:56 -05:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
ShadowLarkens
22c85075f4 Ported tg asset cache 2020-02-19 19:55:01 -05:00
Arokha Sieyes
d5b820fc58 VChat: Redone chat output in Vue.js
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
2020-02-19 19:55:01 -05:00
Razgriz
aafc858b30 Merge pull request #235 from Shadowfire117/Fluidvorebellies
Liquid vore bellies!
2020-02-19 01:28:34 -07:00
Shadowfire117
4b3cb05137 Update bellies_vr.dm 2020-02-18 12:43:32 +01:00
Leshana
25fd4147c5 Add debugging logs in an effort to track down the Timer subsystem failure point.
Given unsuccessful attempts to reproduce in testing, we need logging in production. These logging statements can be removed once the root cause is discovered.
2020-02-17 20:27:26 -05:00
Heroman3003
57b7302ea1 Fixes null empty supplypack appearing in last category (#6698) 2020-02-17 01:19:44 -05:00
Shadowfire
71b3c11df7 Liquid vore bellies!
After a week of non-stop work on coding this its finally here! Churn your friends into different liquids in your vore bellies, make some over time using nutrition, empty into containers, into other vore bellies or stomach, even into other people as well! You can write custom messages for every belly for people to see if you want them to, so this vore addition works well for not only vore, but also for inflation and other 'kinky' things, bottoms can take advantage of this as well to show off 'donation's from your tops!

It works for anything that has a vorepanel, so synths and borgs can also join in on the fun! (Not an expert on those folks, so sorry if there are some bugs when I made it to include them :c)

I plan on making on the second phase of this poject (wont start now, I need break and feedback x.x):

Allow people to set transfer verbs and custom names for liquids when they are transfered, sorry, there wont be actual custom fluids, thats not something that can really be done easily if at all!
Toggle for belly noises when walking around, so the more full people are the more often and clearly sloshing and such is heard
More reagents! Do give tell what you would like, of course meds and absurd chems will be a no!
Certain races/synths/borgs will be able to select additional liquids they can already produce in non-vore way!
Potential round persistency of liquids! This will only be the fullness of belly, not the content, since this can be abused to transfer powergaming reagents across shifts! So selected reagent of belly will be what the belly contains
Adjust how quick and slow the rate of liquid production can be
Possible custom messages to replace normal vore messages when at certain intervals of fullness, like prey splashing in fluids, folks seeing struggle messages with bulges appearing on liquid filled belly
Puddles! Puddles which name and color are based on fluid spilled on floor! Will also mean transfer will get a choice to dump onto floor

Finally I wanna thank Jon for a lot of code help, and Aronai to get the few final kinks worked out!
2020-02-16 12:40:29 +01:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
0bbc8109ae Merge pull request #6675 from GeneriedJenelle/patch-1
Logs graffiti and crayon drawings: Non-Cursed PR
2020-02-09 23:45:06 -05:00
Repede
23b6d8cb3c Better config for extended shift restart 2020-02-09 03:16:52 -05:00
Arokha Sieyes
aa528264dd Add some vorestation-specific IPR things 2020-01-31 14:53:52 -05:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
2020-01-31 18:23:50 +01:00
TheFurryFeline
e633357ad3 Fix Autotransfer
Changelog Notes:

- Revert the removal of automatically called transfers if no players are in round.
2020-01-21 10:50:52 -05:00
TheFurryFeline
8b3f923022 One hour each vote, ya dork
Changelog Notes: 

- Mirrors 8635c10cb7 (diff-4c8c96ffe84f42601f70e27064063cd0)
2020-01-16 23:10:26 -05:00
Razgriz
c9b4ad7a83 IP Reputation Checking 2020-01-16 02:55:45 -07:00
Atermonera
4fb26a6429 Merge pull request #6620 from Heroman3003/eventpause
Pauses event processing while doing event actions
2020-01-15 23:43:46 -05:00
Atermonera
cdca4f68de Merge pull request #6618 from Shadow-Quill/Event-Manager-Time-Fix
Event manager logs now show correct station time
2020-01-15 23:10:32 -05:00
Aronai Sieyes
e67419d8cc IP reputation checking 2020-01-15 14:30:41 -05:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Razgriz
92400a0506 Whitelist fix 2019-12-30 02:33:17 -07:00
Hawk_v3
a48b6f7cb2 Merge remote-tracking branch 'upstream/master' 2019-12-29 19:01:58 +00:00
Razgriz
8635c10cb7 One hour
One hour instead of 4
2019-12-28 22:39:33 -07:00
Razgriz
f2474eb2c6 Add files via upload 2019-12-25 04:15:14 -07:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Novacat
bf70c3ec3b Update configuration.dm 2019-12-20 01:14:31 -05:00
Atermonera
0111815165 Buffs radiation so it isn't defeated by a thin sheet of lead. 2019-12-20 00:51:06 -05:00
TheFurryFeline
d9d22aea48 Fix Vote Message
Title.

Changelog notes:

- Changes the final round vote message to something more polite. Also removes the offensive comment.

- Interval * 3, not 4.
2019-12-19 14:15:07 -05:00
Unknown
73cd8c0a09 More Fixes 2019-12-10 20:57:04 -05:00
Novacat
a859ed8fac Revert "Ports Baystation Timer Subsystem" 2019-12-10 20:49:41 -05:00
Unknown
a7711708c8 Fixes Diff issues 2019-12-09 13:22:13 -05:00
Unknown
894bde2c09 Ports Baystation Timer Subsystem 2019-12-09 13:16:07 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Mechoid
99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
izac112
6d1258bc11 Edit 2019-11-19 22:58:59 +01:00
izac112
f43601eecd Changes it from "an additional hour" to "an additional four hours" 2019-11-19 22:55:33 +01:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
DigitalSquirrel95
30f751b23f Update vote.dm 2019-10-11 02:29:58 -04:00