07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
95ff8c2080
Tweaks to pickup/equip sounds.
2020-09-20 06:57:07 -04:00
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
10ca73bc6e
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576
2020-08-28 13:30:54 -04:00
57bc515c04
Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases
2020-08-27 22:28:46 -04:00
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
48af4c881c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-22 20:07:45 +02:00
c63d6c5777
Adds wearing cones and caution signs ( #7466 )
...
* Adds wearing cones and caution signs
* Fixes quarantine shuttle PoI
* Create Lorilili - janiwear.yml
2020-08-17 12:59:40 -04:00
f00fdebbb9
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
...
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
1456af50f7
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-14 00:21:02 +02:00
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
a697e83ebd
Merge pull request #7326 from Neerti/arrival_announcement_fix
...
Arrivals Shuttle Message Fix
2020-07-09 18:29:38 -04:00
c8693a79a4
Revert Preamble
...
Because the newscaster beeps at you, then the preamble, then the station. STOP. IT'S ENOUGH.
2020-05-24 23:19:25 -07:00
2dd9fbc473
Update announce.dm
2020-05-21 20:44:22 -07:00
8e8aac4be1
adds RPED sprite in hand
2020-05-20 22:50:35 -03:00
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
e3b5d24c8b
Obsolete the PROXMOVE flag and uses
2020-05-18 13:31:54 -04:00
bba0a05f5f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-13 10:21:49 +02:00
d4cfdcfb3a
Switch to using GLOB.admins instead of admins
2020-05-12 11:16:54 -04:00
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
f4c8a7e2f5
Replace/Add lots of sounds from VerySoft
2020-05-05 22:43:31 -04:00
47d81e83b2
Merge pull request #7614 from VOREStation/aro-ssnightshift
...
Port SSnightshift from Paradise
2020-05-03 19:00:32 -04:00
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
7955d0c389
VS: Announcer fix
2020-05-03 17:49:48 -04:00
62e5d5a413
Refactor client/Move
2020-04-30 15:46:51 -04:00
c2ca984d18
Merge VS changes for telecomms
2020-04-29 10:24:37 -04:00
eb6eb7bcd6
Refactor telecomms and consoles to operate on logical zlevels
2020-04-28 17:56:35 -04:00
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
997204960c
Spawn statistic_cycle off to not sleep SSticker.
2020-04-13 17:38:12 -04:00
d7e8a53084
VS: Announcement tweak
2020-04-11 15:59:32 -04:00
f8d920fd02
Allow 'offmap spawn' jobs to be isolated from station employees
2020-04-11 12:03:10 -04:00
7d074edf6b
VS: Update announcer for telecomms refactor
2020-04-11 12:03:10 -04:00
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
027028b314
Repaths collapsible white canes to not anger beepsky
2020-03-25 16:39:18 -04:00
a40df7dda7
Earlyports some bugfixes
2020-03-20 00:35:55 -04:00
972deeae2d
Update announce.dm
2020-03-15 14:42:57 -04:00
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
0d9345adde
Half-Refactors Jobs
2020-03-03 16:28:33 -05:00
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
967fd17048
Rename to discs_vr.dmi and correct copypaste error
2020-02-29 10:37:41 -05:00
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
b3b51a7c3a
New sprites for discs with unique colors
...
Now every disc has a unique color rather than most of them being the same and all of them being in cloning.dmi.
Sprites from CEV-Eris.
2020-02-20 21:37:15 -05:00
3391de2f42
canes and crutches ( #6694 )
...
* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider
added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout
* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider
added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout
also fixed config.txt fuckup
* fixed a spelling error
2020-02-19 14:34:41 -05:00
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
67889b8f99
Merge pull request #6653 from zekesulastin/disable-stat-tracking
...
Changes DBCore connection procs to check for config value SQL_ENABLED instead of ENABLE_STAT_TRACKING
2020-02-03 20:49:32 -05:00
0d40994226
Fixes galore & New away mission
...
Beach Away mission is Now Whiskey Station Mission.
Fixes a large number of bugs from github (Help me pls)
2019-12-16 23:12:56 -05:00
99acb57b34
Bugfixes galore, New beach away, file shrink to 250x250
...
Completely revamps the beach mission. No more 'safe' missions for our intrepid explorers.
Fixes a metric ton of bugs that I actually lost count. My head hurts.
Several varients of mobs have event types added to prevent them from wandering, for the away missions.
Also Shrinks files down to 250x250.
2019-12-16 01:56:56 -05:00
37140bbd6b
Tore it out, just like my heart
...
Removes all mutiny code and old anouncement code. To be fixed later and re-added. (Breaks travis due to color)
2019-12-14 12:22:07 -05:00
f86a104f40
Fixes telecoms
...
Fixes telecoms, adds mutiny gamemode stuff, still needs fixes before it'll work.
Adds old anouncements file, but desk anouncements are not yet functioning. Disabled for now.
2019-12-13 16:37:32 -05:00
Cadyn