Commit Graph

1062 Commits

Author SHA1 Message Date
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
2020-05-18 20:30:52 -04:00
Izac Joof Forsgren
42e5d11fb4 Merge branch 'master' into izac-voreupdate 2020-05-18 20:14:49 +02:00
Aronai Sieyes
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Aronai Sieyes
cb900f6abe isstorage() 2020-05-17 13:56:42 -04:00
Killian
78f685dae0 fixed: all the other stuff 2020-05-17 08:13:52 +01:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Atermonera
02f82fc1f0 Refactor move/click code and cooldowns 2020-05-15 14:03:15 -04:00
Aronai Sieyes
4c9bced82d DMAPI to 5.1.1 2020-05-15 00:34:42 -04:00
Aronai Sieyes
d78f595352 Upgrade DMAPI to 5.1.0 2020-05-13 16:00:16 -04:00
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Heroman
25a7bde56f Removes redundant check for AI 2020-05-12 18:35:51 +10:00
Heroman
fb8e2680b0 Allows Cyborgs and AI to earn PTO and departmental playtime 2020-05-12 07:24:33 +10:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Rykka
90bc016390 Adds framework/backbone for TGS4 auto-update system
Adds TGS4 from https://github.com/tgstation/tgstation-server to Virgo, allowing auto-update functionality and testmerges.

How well it runs depends on how @Arokha sets things up. :p
2020-05-09 22:18:37 -04:00
Aronai Sieyes
5f8ce48793 Merge pull request #7710 from VOREStation/upstream-merge-7064
[MIRROR] Adds preference to control multilingual behaviour
2020-05-08 14:55:46 -04:00
Atermonera
ee07d117f2 Adds preference to control multilingual behaviour 2020-05-08 00:43:57 -04:00
Atermonera
82f8293b25 Merge pull request #7101 from MisterLayne/prommie-lang-fix
Fixes Promethean Language
2020-05-07 21:38:43 -04:00
Aronai Sieyes
393366a825 Refactor job joins for noncarbons 2020-05-07 19:48:25 -04:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00
Aronai Sieyes
0b19c528da Allows do_mob and do_after to be exclusive, to prevent stacking 2020-05-05 19:10:55 -04:00
Aronai Sieyes
01a51e5acd Add prefs for Be Morph, Be Maintpred, Be Lost Drone
Allows the 'never for this round' button to work, and for them to be disabled entirely if you don't want to be asked again.
2020-05-04 20:04:43 -04:00
Aronai Sieyes
538e85283b Fix out-of-order role candidate options
fixup pol commit
2020-05-04 20:04:43 -04:00
Aronai Sieyes
47d81e83b2 Merge pull request #7614 from VOREStation/aro-ssnightshift
Port SSnightshift from Paradise
2020-05-03 19:00:32 -04:00
Atermonera
77fef98789 Merge pull request #7010 from atlantiscze/2020_04_17_LoadBalancing
Ports over power-related enhancements and tweaks i coded for Bay a while back
2020-05-03 18:45:25 -04:00
Aronai Sieyes
aa6d22097b Port SSnightshift from Paradise
Makes the station have a night mode.
2020-05-03 17:51:05 -04:00
Atermonera
23e72aa709 Merge pull request #7043 from MisterLayne/prommie-lang
Promethean Language
2020-05-03 03:14:21 -04:00
Aronai Sieyes
f6214506c6 Fix radial menu GC 2020-05-01 11:49:42 -04:00
SplinterGP
78f4a2fd3f Autolathe patch, fixes teleporter stuff making it buildable 2020-04-30 20:08:06 -03:00
Leshana
10b0323d6f Use can_atmos_pass to reduce proc-calls in c_airblock()
- Add additional can_atmos_pass value ATMOS_PASS_PROC which indicates custom behavior requiring calling the CanZASPass proc.
  - The benefit being for the other three values we DON'T need to call CanZASPass at all!  We already know the behavior without the overhead of a proc call.
  - Obviously any atom with can_atmos_pass = ATMOS_PASS_PROC cannot now call ..() in CanZASPass() since the default behavior would be to (recursively) call CanZASPass()
  - This required re-numbering the constants, so I also fixed all code that assumed particular values for the constants.
- Switched all types which overrode CanZASPass with custom logic to be can_atmos_pass = ATMOS_PASS_PROC
- Changed /turf/c_airblock() to skip calling /atom/movable/c_airblock() for the three can_atmos_pass values that don't require calling the proc.
2020-04-30 14:50:57 -04:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045
[MIRROR] Removes limits on eating, centralizes nutrition changing.
2020-04-29 19:23:55 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Atermonera
84eb15f9cc Merge pull request #7041 from VOREStation/vplk-disposal-consts
Slightly clean disposal pipe construction code.
2020-04-29 16:52:26 -04:00
Aronai Sieyes
8ec31c9aa4 Refactor AI into two subsystems and clean up targeting some 2020-04-26 23:32:45 -04:00
Unknown
dfedf60c0f Requested Changes 2020-04-26 10:58:56 -04:00
Aronai Sieyes
f2314c32bb Merge pull request #7405 from VOREStation/vplk-static-machinery-power
Static Machinery Power
2020-04-24 21:06:52 -04:00
Novacat
de5b875043 Merge pull request #7351 from VOREStation/upstream-merge-6956
[MIRROR] Saycode Overhaul -- Multilingualism
2020-04-23 22:48:51 -04:00
Leshana
763753648b Implements "static" area machinery power usage
- Instead of using auto_use_power to re-tally up machinery's power usage every cycle, track the steady "static" load separately from the transient "oneoff" usage.  Machines then only need to inform the area when they use oneoff power or *change* their steady usage.
- Remove auto_use_power and stop SSmachines from calling it.
- Add vars to track "static" usage for each of the three power channels to /area
- Rename the existing three vars to "oneoff" so its clear what they mean (and to catch people accidentally updating them directly)
- Update area power procs and APCs to use the new variables.
- Rename /area/proc/use_power() to use_power_oneoff() to make it clear what it is doing.
- Deprecate /obj/machinery/use_power() in favor of use_power_oneoff() but don't delete yet.  Can transition gradually.
- Add logic to the update_power procs on machines to calculate the deltas and update static area power whenever their usage changes.
- Add logic to machines to update area power when they are created, destroyed, or move.
- Moved /obj/machinery procs related to area power usage into machinery_power.dm to make them easier to find.
- Added or updated comments in several places to explain what is going on and how to use it.
2020-04-23 19:04:34 -04:00
SplinterGP
ca09ee6305 Autolathe fixes 2020-04-22 02:09:01 -03:00
Novacat
5d41534ab8 Update is_helpers.dm 2020-04-21 14:38:00 -04:00
Aronai Sieyes
88154f0374 Adds rutile (titanium ore) and other materials 2020-04-20 12:07:45 -04:00
ShadowLarkens
139d5cd3c3 Saycode Overhaul -- Multilingualism 2020-04-20 04:12:53 -04:00
Unknown
a5f62634be Adds additional safeties
Stops ships from being deployable on planet surfaces
2020-04-19 19:30:35 -04:00
Repede
fa632c811d Merge branch 'master' into voreupdate 2020-04-17 00:13:39 -04:00
Repede
e44e346352 Release Update
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
2020-04-16 21:07:33 -04:00
Aronai Sieyes
3f03b72ea2 Adjust icon 2020-04-16 13:50:43 -04:00
Aronai Sieyes
3ea7696c38 Adds autosaving 2020-04-16 12:40:30 -04:00