cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 04:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,163 Commits 9 Branches 26 Tags
ae8e37f2ca72fd5ff4fdc68d13bb7e99e35a67ef
Commit Graph

3320 Commits

Author SHA1 Message Date
David Winters
b6ac68836a please work PLEASE 2020-09-29 00:28:25 -04:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Novacat
4b83c18fb7 Merge pull request #9071 from VOREStation/upstream-merge-7660 
[MIRROR] Fix duplicate results from analyzing some objects
 2020-09-21 16:54:29 -04:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00
Novacat
6fad165033 Merge pull request #9067 from VOREStation/upstream-merge-7651 
[MIRROR] Tweaks to pickup/equip sounds.
 2020-09-21 13:51:44 -04:00
Meghan-Rossi
cbfd4789d7 Fix duplicate results from analyzing some objects (#7660) 2020-09-20 07:18:35 -04:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
ShadowLarkens
308e32c860 TGUI Agent Card 2020-09-19 22:57:51 -07:00
Novacat
75186c414e Merge pull request #8987 from VOREStation/upstream-merge-7624 
[MIRROR] Fixes explosion maths.
 2020-09-05 12:25:19 -04:00
Novacat
5be90e22ff Update tanks.dm 2020-09-05 12:14:14 -04:00
Verkister
f4e5ab45af Fixes explosion maths. 2020-09-05 11:05:59 -04:00
Heroman3003
e4d0b1a81b Adds board versions of a bunch of lawsets (#7611) 2020-09-05 10:20:42 -04:00
ShadowLarkens
c32f05e1f7 TGUI Civilian 
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
 2020-09-02 13:32:42 -07:00
Novacat
dba5a14b5f Merge pull request #8952 from Heroman3003/constructible-vorelaws 
Constructible vorelaws
 2020-09-01 08:02:26 -04:00
Heroman
732448d389 Fixes indent errors 2020-09-01 20:37:56 +10:00
Heroman3003
045be423b3 .dm 2020-09-01 16:27:42 +10:00
Heroman3003
00913ff339 Adds boards for AI vore laws 2020-09-01 16:26:39 +10:00
Cyantime
99009e6266 Jetpack cleanup, don't use fuel when unneeded 2020-08-31 21:13:04 -04:00
Cerebulon
7c57c7c0bd Vendor enhancement fixes (#7577) 
* Vendor enhancement fixes

* skrellsnax trash, tuna name
 2020-08-30 02:49:00 -04:00
Unknown
10ca73bc6e Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576 2020-08-28 13:30:54 -04:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Atermonera
57bc515c04 Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases 2020-08-27 22:28:46 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Novacat
a69e94f948 Merge pull request #8519 from KillianKirilenko/kk-misc2 
Explorer/Pathfinder Belts
 2020-08-25 17:15:14 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Novacat
a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449 
[MIRROR] Flavour Enhancement: Vending
 2020-08-21 13:32:37 -04:00
Verkister
929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Atermonera
4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint 
Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:28:23 -04:00
Novacat
d63f0b2c3e Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat 
Adds Mech Toy Battles!
 2020-08-21 01:14:42 -04:00
Atermonera
3edff36a58 Merge pull request #7502 from Meghan-Rossi/ducttape 
Fix duct tape on self
 2020-08-20 22:24:43 -04:00
Atermonera
1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
Mechoid
496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
Verkister
5b29b10db2 Merge pull request #8704 from VictorZisthus/VictorZisthus/Maptweaks 
Victor zisthus/maptweaks
 2020-08-16 21:16:04 +03:00
Victor Zisthus
69ac92250a Access Overhaul + Minor Map Tweaks 
Overhauled most doors with new access codes as a result of the code fixes intended to keep departments as pure as possible.

Other changes marked below.

(77,111,1) Added Intercom
(77,110,1) Changed Door Sprite
(43,60,1) Added Atmos Access
(105,32,1) Tider's greetings...
(100,38,2) Set starting pressure to match other tanks.
 2020-08-15 18:26:43 -04:00
Rykka
5acb88413c Rename toy/mech to toy/mecha to match mecha code. 2020-08-12 20:08:05 -04:00
Novacat
e4b5b8ea2d Merge pull request #8661 from ShadowLarkens/med_pass_2 
TGUI Medical: Second Pass
 2020-08-12 20:01:12 -04:00
Greenjoe12345
ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -04:00
ShadowLarkens
5c6025b8e8 Merge remote-tracking branch 'upstream/master' into med_pass_2 2020-08-12 06:12:32 -07:00
Rykka
a5fc9d81ce Adds Mech Toy Battles! 
Port of https://github.com/tgstation/tgstation/pull/51817

Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station. You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech.

Each mech has its own health stat and special ability that they'll use in combat against each other. How exciting!

Also slightly refactors toy locations and changes toy mechs from being JUST prizes to their own proper toy subtype!
 2020-08-12 04:31:00 -04:00
ShadowLarkens
f156857e14 TGUI Appearance Editor (Mirrors & Admin) 2020-08-10 08:08:33 -07:00
ShadowLarkens
951f37d2e3 TGUI Engineering: Squashed Edition (Commits Below) 
TGUI APCs

 TGUI vending machines

 Fix AI default_tgui_interaction

 TGUI Airlocks

 Station & Atmospheric Alert TGUI + Misc NTOS-TGUI Fixes

 TGUI Air Alarms & Central Atmospheric Control

 Airlock TGUI

 TG... got rid of UI for fire alarm. í´·

 TGUI Gas Heating/Cooling System

 TGUI Gas Pump & Passive Gate + Fixes

 TGUI Omni Atmospherics

 TGUI Pipe Dispensers & RPD

 TGUI IntelliCore & Vending Fix

 TGUI Handheld Tanks

 TGUI Portable Pump & Scrubber

 TGUI Tank Dispenser & Canisters

 TGUI Radios

 TGUI SMES & Air Alarm adjustment

 Tweak vending machine interfaces a tad

 TGUI Algae Farm

 TGUI general_air_control

 - Distro & Waste Console
 - Riot Control Console
 - Atmos Intake Console
 - Engine Cooling Console

 TGUI Heavy Scrubber Control (and body scanner fix)

 TGUI trinary devices & shutoff monitor

 TGUI Telecomms Log Browser

 TGUI Telecomms Machine Browser

 TGUI Spaceheater Internal Panel

 TGUI Gravity Generator

 TGUI Id Cards & Fix ID Card Images

 TGUI Id Card Redesign

 TGUI Turbolift

 TGUI Suit Cycler & Suit Storage Unit & Vending Fixes

 TGUI Power Monitor

 TGUI Signalers

 TGUI Employment Records

 TGUI Drone Console

 TGUI RIGSuits

 TGUI PA & PACMAN, and Margin Fix

 TGUI Solar Panels & Fix Power Monitor

 Adjust TGUI modules & their interaction with NTOS

 TGUI RCON

 TGUI Message Monitor

 Bump TGUI line limit to 120 (ParadiseSS13/Paradise#14002)

 TGUI Exonet & NTNet Relay

 TGUI Telecomms Multitool Menu

 TGUI Shield Capacitor & Shield Generator

 TGUI Supermatter-everything & Refactors
 2020-08-09 04:46:31 -07:00
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
lbnesquik
fbacbad91d Tweaks to taur clothes, particularly saddles as well as tail tags. 
- Remove capitalisation from back_vr.dmi
- Add a tag to most tails. This can be used for many things, but mostly to have an simpler check of the tail type. See backpack_vr.dm.
- Switch the backpack sprite selection to a switch()
 2020-08-02 22:22:27 +02:00
Killian
c98499403b Update belt_vr.dm 2020-07-30 02:51:21 +01:00
Killian
71d332a636 Update belt_vr.dm 2020-07-29 05:44:59 +01:00
Killian
f6df2b83a8 explorer belts 2020-07-29 05:25:18 +01:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Rykka
21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04:00