Razgriz
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
izac112
22880f526d
Voreupdate
2020-07-02 15:39:00 +02:00
Atermonera
736fdab6e3
Merge pull request #7273 from Cyantime/obs
...
Observing improvements
2020-06-24 11:36:18 -04:00
Atermonera
90a2053e57
Wrist-bound PDAs!
2020-06-21 16:42:05 -04:00
Darlantan
a0555ef2d4
Re-adds articles, fixes year yet again
2020-06-16 04:03:21 -04:00
Razgriz
1eae9b9bd1
Revert "Merge pull request #375 from Darlantanis/StarfireReportUpdate062"
...
This reverts commit cd62907c51
2020-06-14 23:04:23 -04:00
Darlantan
b440e687b9
Fixes station year
2020-06-14 03:27:41 -04:00
izac112
79abbcbc2f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-03 18:30:13 +02:00
Aronai Sieyes
719151a74a
Port Bay's lockers, crates, largecrates, wall lockers
2020-05-31 12:26:00 -04:00
izac112
0d1fe7d706
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-05-30 16:01:43 +02:00
Aronai Sieyes
6809133d75
Port Eris' extensive floor blending system
2020-05-29 14:00:43 -04:00
izac112
e807b80281
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-05-27 20:10:55 +02:00
izac112
2f8e296e0e
Switches back from solcom to solgov and TCG to USDF
2020-05-24 14:10:51 +02:00
Aronai Sieyes
49b9896f73
Redo respawning
2020-05-23 17:32:02 -04:00
Aronai Sieyes
61ae4f886c
Shapeshifter color selection knows default/current
2020-05-21 11:59:54 -04:00
Razgriz
3dabdca3f3
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2
2020-05-21 03:20:13 -07:00
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
Aronai Sieyes
48563200ce
VS: Tweak some icon blending
2020-05-18 13:42:42 -04:00
Aronai Sieyes
0adea12715
Optimize mob finding in radio ranges
2020-05-18 11:17:39 -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
190e8bdd5a
Try to ensure some mobs don't end up processing in SSmobs
2020-05-17 09:40:39 -04:00
Aronai Sieyes
0d14487cdc
Add serial comma
2020-05-16 17:06:21 -04:00
izac112
bbb084a354
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-16 09:06:27 +02:00
Arokha Sieyes
a77da3b5df
Clean up merge conflicts
2020-05-14 09:44:52 -04:00
Atermonera
21620a1814
Add UAVs
2020-05-14 00:34:29 -04:00
izac112
bba0a05f5f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-13 10:21:49 +02:00
Aronai Sieyes
d4cfdcfb3a
Switch to using GLOB.admins instead of admins
2020-05-12 11:16:54 -04:00
izac112
2b3fc9a740
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-11 18:20:43 +02:00
Arokha Sieyes
6d47c2f95c
Further time fixes
2020-05-08 10:09:40 -04:00
Arokha Sieyes
323f7e651f
Fix/rename some timing stuff
2020-05-08 01:51:52 -04:00
Razgriz
81ad690b89
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull
2020-05-06 22:36:01 -07:00
Aronai Sieyes
ae303cd122
Merge pull request #7676 from VOREStation/aro-bicon2
...
Refactor examining and some of getFlatIcon
2020-05-06 23:21:41 -04:00
Aronai Sieyes
939105952a
"Deg" instead of symbol
2020-05-06 23:11:29 -04:00
Aronai Sieyes
9acf643828
Make DS2NEARESTTICK macro
2020-05-06 20:26:51 -04:00
Aronai Sieyes
bd298810f2
Redo examining in general and tweak getFlatIcon
2020-05-06 18:37:46 -04:00
Aronai Sieyes
d172e2dd04
Cached version of icon_states() proc
2020-05-06 16:06:44 -04: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
ShadowLarkens
dc61ee2ffe
Vore Datums implemented, awaiting integration&testing
2020-04-30 16:37:41 -07:00
Unknown
49570f0d24
New Lore Oversights
...
- Loads banners_vr
- Properly sets time back to 2320
2020-04-30 09:11:08 -04:00
Aronai Sieyes
fb87fbe2d7
VS: Add UAV
2020-04-28 23:18:27 -04:00
Aronai Sieyes
0c2f8cedb5
Add UAV, UAV software
...
Design placed in mechfab
2020-04-28 23:18:08 -04:00
Atermonera
7bf77736c2
Adds empty filter classes to send messages to particular vchat filters.
2020-04-20 03:28:57 -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
Leshana
3be0330db2
Remove the goonstation /datum/controller/processScheduler as it is no longer used.
2020-04-14 16:17:32 -04:00
Aronai Sieyes
0d39c5535e
Merge pull request #7200 from VOREStation/aro-offmap-rebase2
...
ITV Talon offmap spawn jobs
2020-04-13 09:28:19 -04:00
Leshana
262faa38e4
Replace global all_areas list with world.
...
It ends up having similar performance, so might as well not bother with all_areas.
2020-04-12 18:04:54 -04:00
Erik
eb9c3cd387
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020
2020-04-11 16:53:35 -07:00
Aronai Sieyes
e2d2964546
Refactor telecomms to send messages to logically adjacent zlevels
2020-04-11 12:03:10 -04:00
Leshana
d66f508541
Fixes for vorestation merge of "Rewrites the Rewritten Event System"
...
- Remove duplicate pick_random_edge_turf resulting from our simultaneous addition of it (in overmaps PR)
- Disable SSgame_master and SSevent_ticker subystems, we are still using the original events subsystem.
- Disable the game_master implementations as we are not using them.
- Comment out references to SSgame_master since we are not using it (yet?)
2020-04-06 17:31:26 -04:00
