Commit Graph

5310 Commits

Author SHA1 Message Date
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Repede
2e7db593d9 RPD fix 2020-04-05 12:30:11 -04:00
Repede
f2740bf031 Fixing runtimes 2020-04-05 12:06:49 -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
RadiantFlash7
909393115d Merge pull request #8 from Yawn-Wider/master
Updating my Branch
2020-04-03 22:34:31 -04:00
RadiantFlash7
8692c589f1 Security update++ Geigers and more
Rebuilds security to /not/ suck.
Left Vacant office for security Next to HoS office, for the Security Pilot Officer (To be added in future)
Dock for Interceptor left near sec.
New Geigers added around the map!
Vents and scrubber fixes.
adds in HoP req console which was not in by default.
2020-04-03 22:14:39 -04:00
Atermonera
d7a9416bb8 Clean up various things 2020-04-03 03:15:06 -04:00
Leshana
f022647037 Adds point defense batteries to defend against meteors
- Creates a global meteors list to make it easier to find them.
- Adds point defense mainframe, batteries, projectiles, circuitboards, and R&D designs.
- Adds sound effects and icons for the new machines.
- Original code and sprites ported from Baystation.  Adtapted to our code, added icon states and QoL elements.
2020-04-01 21:30:30 -04:00
Ketrai
51486fc10c waghh 2020-04-01 12:32:30 +02:00
Aronai Sieyes
0d043fe44e Update assemblies to modern coding standards 2020-03-30 22:18:44 -04:00
Leshana
2e4dcabd09 Fix Runtime in garbage.dm,337:
/obj/item/device/transfer_valve destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic
2020-03-30 16:53:55 -04:00
Aronai Sieyes
a7aa71e7ad Fix matches and SSobj/SSprocessing 2020-03-29 16:19:13 -04:00
Atermonera
752d560d76 Converted old supply_controller to SSsupply 2020-03-27 17:38:05 -04:00
Atermonera
f4fb9ac262 Merge pull request #6885 from TheFurryFeline/TFF-Message_Fixy_For_Snowballs_and_Kickstands
[Feature Tweak] Message Fixy For Snowballs/Kickstands
2020-03-25 18:47:34 -04:00
Atermonera
027028b314 Repaths collapsible white canes to not anger beepsky 2020-03-25 16:39:18 -04:00
Atermonera
87333d9c25 Add mob/living stat setter and observer 2020-03-23 22:47:44 -04:00
Atermonera
d397c2c1fe Merge pull request #6840 from Neerti/qol_notification_sounds
QoL: Various Notifications
2020-03-20 15:09:47 -04:00
Unknown
a40df7dda7 Earlyports some bugfixes 2020-03-20 00:35:55 -04:00
Schnayy
67aff4cb42 sprite fixes (#6863) 2020-03-19 00:18:43 -04:00
Atermonera
cd10c54d5c Merge pull request #6834 from Mechoid/RIGFixes
Fix various RIG issues
2020-03-17 01:06:31 -04:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Novacat
8ca10f2be4 Merge pull request #6876 from VOREStation/upstream-merge-6823
[MIRROR] Makes PDA beeps a toggable option.
2020-03-15 15:14:52 -04:00
Atermonera
b2becc99b5 Merge pull request #6823 from lbnesquik/KoK-PDA-tweak
Makes PDA beeps a toggable option.
2020-03-15 14:48:00 -04:00
Novacat
33d8c118b7 Update firstaid.dm 2020-03-15 14:46:16 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Shadowfire
ce1c0ec533 Casino prize dispenser update
Redoing since github believes theres to be a conflict when in reality there was just changes made to files already been worked on in the casinoupdate branch
2020-03-13 03:36:47 +01:00
Novacat
78e6fa891a Merge pull request #6833 from Novacat/nova-pathfinder
Rigsuit Slot Updates
2020-03-12 13:26:45 -04:00
Unknown
e8282b6232 Rigsuit Slot Updates
- Adds Defibrilator compatibility to RIGsuits
- Allows the compact RIGsuit's suit storage to be compatible with belts and compact defibrilators
2020-03-12 12:30:09 -04:00
Novacat
9b54f851b7 Merge pull request #6819 from VOREStation/upstream-merge-6810
[MIRROR] QoL: Hacking
2020-03-11 21:26:36 -04:00
Novacat
fd8c620703 Merge pull request #6817 from VOREStation/upstream-merge-6802
[MIRROR] Adds more machine button sounds
2020-03-11 21:25:40 -04:00
Neerti
22954a5a04 QoL: Hacking (#6810)
* Makes hacking window consider all hands instead of just the active one.

* Makes bottom indicators in hacking window go bold if they changed since the last refresh.

* Changelog
2020-03-11 20:36:42 -04:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802)
* Adds more machine button sounds

* chang
2020-03-11 20:32:06 -04:00
Cerebulon
279cd2dc73 PDA Boops when you button (#6801) 2020-03-11 20:30:51 -04:00
Aronai Sieyes
ba15309e2c Merge pull request #6803 from Novacat/nova-pathfinder
Buffs ERT Backpack
2020-03-11 20:15:47 -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
Unknown
ad836beff3 Buffs ERT Backpack
I always thought it strange that the ERT had both their own backpacks, and access to the unquestionably superior Syndicate dufflebags.

This buffs the ERT Backpack to be on par with the syndicate dufflebag. Long term plan is to remove the Syndicate dufflebags from the ERT Armory, but that cannot be done yet due to the mapping freeze.
2020-03-10 23:03:28 -04:00
Shadowfire
f6daac300f fixy fix
Okay, fixed a lot of issues and reacted to the comments to parts of commit, hopefully we will get a nice pretty travis report this time
2020-03-09 15:31:04 +01:00
Shadowfire117
1beac90488 fixes
fixed some runtime errors with apparently lack of fixes I made earlier that I needed to redo.
changed some reagent containers which used the old New() proc instead of intialize
added gelatin and macha latte to dispenser and cartridges, might still have runtime and compile errors, but chompstation2 has the reagents implemented so wont cause issues.
2020-03-09 13:23:35 +01:00
Novacat
3c06d62345 Update weldingtool.dm 2020-03-08 03:25:18 -04:00
Mechoid
acc712e1d5 Exosuit Expansion: Return of the Ripley 2020-03-08 00:52:32 -05:00
Shadowfire
3c3817ecd3 Bug fixing, improvements to furniture, jukebox change
Made casino jukebox music finally only appear on its proper jukebox
made tiles have material variable, allowing recovery of carpets from padding
made carpets give padding different colors
made stools also benefit from colored padding
Made modular sofas able to be made from plasteel and plastic
2020-03-07 09:49:36 +01:00
Aronai Sieyes
7e848e90fc Merge pull request #6772 from VOREStation/aro-blufo
Various minor things
2020-03-06 09:58:00 -05:00
Aronai Sieyes
4b5069582b Sprites for alien and frontier translocators 2020-03-05 23:30:07 -05:00
Novacat
6e23c5f45a Merge pull request #6709 from VOREStation/aro-mistake
Fix way too many vorestation edits
2020-03-05 19:03:58 -05:00
Aronai Sieyes
42dc591215 Merge pull request #6756 from VOREStation/vplk-shuttles
Landmark Shuttles
2020-03-05 13:34:56 -05:00
Arokha Sieyes
b1728c5520 Refactor sleevemate
Allows keeping OOC notes between download/upload of mobs
2020-03-05 12:24:48 -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
Shadowfire
5b0bfcde7a wip casino1
Made confetti sprite and system
Made a confetti grenade
Made special casino card deck and sprites that doesnt contain joker
made sofa constructible from wood, still needs more work
added new casino card decks to casino map
2020-03-02 22:30:33 +01: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
d98cd87585 Merge pull request #6646 from VOREStation/aro-salv
Add salvageable machines
2020-03-01 10:54:21 -05:00