Commit Graph

125 Commits

Author SHA1 Message Date
Razgriz
1e5bd3c5ba Reduce track time
from 25 seconds to 8 :seensomeshit:
2021-08-06 22:59:53 -07:00
Aronai Sieyes
e76e928290 Merge pull request #10786 from ShadeAware/sound-updates
Updates various sound files
2021-08-06 22:32:24 +00:00
Chompstation Bot
8b01c674d0 Improve admin spawn features 2021-07-24 17:05:36 +00:00
Aronai Sieyes
ac00965e68 cock 2021-06-19 22:03:38 -07:00
Novacat
d9fb7b0a42 Merge pull request #10368 from VOREStation/upstream-merge-8083
[MIRROR] Food 4 thought
2021-05-21 20:00:24 +00:00
Novacat
3245498530 Merge pull request #10236 from dwinters99/toys
Toys expansion
2021-05-06 14:42:49 +00:00
Chompstation Bot
8db3a020a0 Micro March beta update. 2021-03-26 23:23:02 +00:00
Novacat
beac75502c Merge pull request #9831 from Novacat/nova-basicfixes
Adds old teshsneeze as an alternate teshsneeze
2021-03-02 22:23:51 +00:00
Razgriz
82c293f8b2 Merge pull request #1096 from MisterGrimm/ScreamForMe
Add unathi scream
2021-01-10 01:19:01 -07:00
Sym
c04dd81012 Add unathi scream
Screms straight from the dino hood
2021-01-08 18:06:19 -05:00
Cadyn
9521b59193 Kassc portals :) 2020-11-30 16:24:46 -08:00
Sym
6ef2a80baf Scream sounds for xenomorph and xenomorph hybrid 2020-10-28 17:26:14 -04:00
Sym
b56e343448 Remove Wilhem from screams, because people like hiding stuff. 2020-10-15 16:53:13 -04:00
Sym
ade92f042b Added TGstation screams, and tweaked scream code
Added 4 default screams for male, and 4 default screams for female. Also added 1 easteregg scream for male.

Also did a bit of tweaking to scream code so it can pick from a list.
2020-10-14 19:02:03 -04:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
BlackMajor
70645b91dd he screm 2020-09-16 14:26:44 +12:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Darlantan
c6862558c8 Commit for new sound and icons 2020-09-05 07:15:05 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Atermonera
3c67a19a20 Ports borg petting from CHOMPStation 2020-08-21 23:32:15 -04:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Atermonera
e144bd2628 Merge pull request #7387 from listerla/teshsneeze
Teshari sneeze fix
2020-08-02 00:06:45 -04:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
SweetBlueSylveon
d90be129c8 Wow a lot to process here.
This adds the entire framework needed for the clowns to work.
Clowns work with three variants:
Normal, friendly, every tuesday clowns.
Big, hostile, space clowns.
And AdminBus Clowns.
The Honk Elemental is here and it spawns eggs that act like lost drone pods. If you're a ghost getting sucked in, you'll be able to choose from any of the normal clowns. This is for a special event that'll happen off station.
There are some unused sprites for clown mobs I haven't gotten coded up. These are all in the "TG clowns" dmi. They will be finished at a later date when I can get them to do their special tricks.
TODO: Edit gutter map, make extra clowns, make clown map.
2020-06-13 01:58:14 -07:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Rykka
3d5bb56f8f Add footstep sounds to almost every single tile.
Shuttle tiles, default floors are still "regular".
Lava, sand, water, grass, beach, mining turfs all have sounds playing now for each footstep. <3

Massive credit to @Arokha for helping me figure out the floor system and sitting through getting it put together. <3 <3 <3
2020-05-09 17:40:14 -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
Leshana
64eb2cf552 Ports the disperser beam from Baystation. 2020-04-16 21:31:49 -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
Atermonera
5c03273ce8 Merge pull request #6884 from Neerti/event_system_fix
Rewrites the Rewritten Event System
2020-04-06 16:23:39 -04:00
Repede
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
Atermonera
d397c2c1fe Merge pull request #6840 from Neerti/qol_notification_sounds
QoL: Various Notifications
2020-03-20 15:09:47 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Leshana
9cbdf184ff Ported Basic Overmap Functionality
- Ports the overmap, ships, sectors, and "landable" ships from baystation.
- Ports necessary computers to control ships and overmap shuttles.
- Shims missing machine and computer functionality pending future enhancements.
- Includes required new sprites and sounds.
2020-03-11 11:11:40 -04: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
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
Aronai Sieyes
e5b9cb57de Add additional chairs 2020-02-29 11:46:11 -05:00
Atermonera
d423427b18 Merge pull request #6760 from listerla/warble
Adds 'warble' emote for Skrell
2020-02-28 20:57:22 -05:00
Atermonera
16183867df Adds holster, lighter, and seatbelt sounds from World Server. 2020-02-24 16:12:37 -05:00
Holdelta
845ba9b4fd Add files via upload 2019-12-31 19:18:34 -08:00
Holdelta
ec99fec1a6 Adding borg petting
Adding borg petting, because its fun.
Help intent - Pets borg
Disarm intent - Taps borg
Grab intent - will do original functions(such as removing the battery when the panel is open)
Harm intent - Punches borg
2019-12-27 01:14:10 -08:00
Repede
9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme
2019-11-29 19:13:53 -05:00
Rykka
b75fa8c151 Add Spider Footstep Sound 2019-10-16 04:20:11 -06:00
Rykka
a67a905557 Adds more soundfiles for later use 2019-10-16 03:36:47 -06:00
Hawk_v3
74cc210e21 Merge remote-tracking branch 'server/master' into map 2019-10-05 23:10:09 +01:00
RadiantFlash7
06ef275fef Adds 2 new sound effects and map stuff
Updated map stuff. Mostly done, needs Disposals piping, and some more spawn points in the snow for mobs.
Also requires testing for halls/lightings.
Zlevels still broke.
Deletes the old maps\test\ version of cryogaia.
2019-10-05 17:47:33 -04:00
Rykka
4cc5771aba Adds 3 grass footstep sounds, adds a small "ding" to the Xenoarch scan 2019-09-22 07:14:02 -06:00
Neerti
f5f20628fd Merge pull request #6169 from GeneriedJenelle/patch-1
Ports Radial Menus
2019-05-28 14:25:49 -04:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00