cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 13:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,995 Commits 8 Branches 26 Tags
6b98b0bfa005dee36fad58a085078d4858dd94bb
Commit Graph

24622 Commits

Author SHA1 Message Date
Holdelta
6b98b0bfa0 Adding: Hound borg models to Eng/Sci/Cargo, and two small additions. 
Adding a total of 6 recolored hound models, light and dark versions of the Medihound across Engineering, Science and Cargo.

Also, adding in *bark functionality for the dogborgs as a whole, as well as adding the bite module for the KMine.
 2020-04-29 20:01:37 -07:00
Novacat
3eaa2ad9fa Lore Overhaul (#7493) 
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
 2020-04-29 19:59:03 -04:00
Aronai Sieyes
8ab8e3494e Merge pull request #7519 from VOREStation/aro-hetr 
Remove vorestation heterochromia since Polaris has it
 2020-04-29 19:24:06 -04:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045 
[MIRROR] Removes limits on eating, centralizes nutrition changing.
 2020-04-29 19:23:55 -04:00
Novacat
81900f5080 Merge pull request #7505 from AmayaWah/pleasestop 
Adds Damon's bomber security jacket.
 2020-04-29 18:45:51 -04:00
Novacat
c70af70266 Merge pull request #7463 from Novacat/nova-ert 
Overhauls First Aid Kits
 2020-04-29 18:44:43 -04:00
Aronai Sieyes
b9c6107f26 Merge pull request #7513 from VOREStation/upstream-merge-7038 
[MIRROR] Rewrite examine() to pass a list around
 2020-04-29 18:38:26 -04:00
Aronai Sieyes
9d6082104d Remove vorestation heterochromia since Polaris has it 2020-04-29 18:36:48 -04:00
Aronai Sieyes
254af863c4 Merge pull request #7510 from VOREStation/upstream-merge-7016 
[MIRROR] Adds heterochromia, makes Teshari clothes recolorable (and footwraps)
 2020-04-29 18:35:21 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Aronai Sieyes
874baa1d2d Merge examine refactor for vorestation 2020-04-29 17:49:54 -04:00
Atermonera
c3537b01e9 Merge pull request #7046 from Neerti/system_3_fixes 
Tweaks and fixes for the new new event system.
 2020-04-29 17:27:57 -04:00
Aronai Sieyes
077bcf49b9 Merge pull request #7514 from VOREStation/upstream-merge-7041 
[MIRROR] Slightly clean disposal pipe construction code.
 2020-04-29 17:20:43 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Atermonera
c03d115089 Merge pull request #7042 from VOREStation/vplk-iconsheet-asset-cache 
Add "icon sheet" asset type
 2020-04-29 16:55:45 -04:00
Atermonera
84eb15f9cc Merge pull request #7041 from VOREStation/vplk-disposal-consts 
Slightly clean disposal pipe construction code.
 2020-04-29 16:52:26 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Unknown
1048a969d4 Admin discussion changes 2020-04-29 15:23:01 -04:00
TheFurryFeline
3afe4adaed Remove Duplicate Code 
Title, response to mirror.
 2020-04-29 15:17:05 -04:00
Greenjoe12345
ff628daae1 Adds heterochromia for humanoid species and Teshari (#7016) 
adds the ability to color the Teshari undercoat, cloak, smock, as well as the footwraps
 2020-04-29 15:11:41 -04:00
Novacat
98574bf939 Merge branch 'master' into nova-ert 2020-04-29 14:29:09 -04:00
Aronai Sieyes
82a41c8d7a Merge pull request #7507 from VOREStation/aro-gravytopple 
Refine gravity generator FSM
 2020-04-29 14:13:57 -04:00
Aronai Sieyes
6cd52ff500 Merge pull request #7498 from VOREStation/aro-uav 
Adds UAVs
 2020-04-29 14:13:29 -04:00
Aronai Sieyes
390943784c Refine gravity generator FSM 2020-04-29 13:10:44 -04:00
Aronai Sieyes
ec0b316730 Merge pull request #7502 from VOREStation/aro-nogravyshuttle 
Have gravity generator ignore /area/shuttle
 2020-04-29 11:41:01 -04:00
Aronai Sieyes
3daef7673f Merge pull request #7494 from VOREStation/upstream-merge-6990 
[MIRROR] Refactor telecomms and consoles to operate on logical zlevels
 2020-04-29 11:40:20 -04:00
Amaya
165931c96a aaaaaaaa 2020-04-29 17:10:07 +02:00
Amaya
c04d919051 *scream 2020-04-29 17:02:12 +02:00
Aronai Sieyes
6dfef88a3c Merge pull request #7488 from VOREStation/aro-hydroviro 
Hydroponics and virology machine icons
 2020-04-29 10:29:48 -04:00
Aronai Sieyes
c2ca984d18 Merge VS changes for telecomms 2020-04-29 10:24:37 -04:00
Aronai Sieyes
49f5a1c4ed Have gravity generator ignore /area/shuttle 2020-04-29 09:31:18 -04:00
ShadowLarkens
463186212e Fix hear_sleep whoops 2020-04-28 22:51:22 -07:00
Aronai Sieyes
e8c068912c Fix MC nav icon 2020-04-28 23:18:48 -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
bdf186d16b Merge pull request #7024 from atlantiscze/2020_04_21_ValveProgram 
Converts Shutoff valve monitoring into a MC program
 2020-04-28 17:57:51 -04:00
Atermonera
eb6eb7bcd6 Refactor telecomms and consoles to operate on logical zlevels 2020-04-28 17:56:35 -04:00
Aronai Sieyes
ac33ebcdec Hydroponics and virology machine icons 
There's crossover, I guess, for some reason!
 2020-04-27 17:46:20 -04:00
Unknown
47e2e1a2e4 Removes duplicate var 2020-04-27 17:12:41 -04:00
Unknown
356fe4fced Fixes Kisuke's gunsword 2020-04-27 17:10:59 -04:00
Aronai Sieyes
8e9f51c133 Merge pull request #7481 from VOREStation/aro-prot 
Prevent protean repairs using fire and cables
 2020-04-27 14:58:28 -04:00
Aronai Sieyes
57f28af1fd Prevent protean repairs using fire and cables 
Doesn't make much sense
 2020-04-27 11:18:03 -04:00
Aronai Sieyes
f2e6280161 Merge pull request #7479 from VOREStation/SERDYKOVKITFIX 
Allows Serdy's modkit to be selected.
 2020-04-27 10:57:33 -04:00
Aronai Sieyes
45b67c5948 Merge pull request #7321 from KillianKirilenko/kk-collar 
Colorable Collar/Choker Accessory
 2020-04-27 10:56:08 -04:00
Cameron653
9eaea818b7 Allows Serdy's modkit to be selected. 2020-04-27 10:43:38 -04:00
Aronai Sieyes
3f6ce31f9a Merge pull request #7453 from InterroLouis/Hiss 
Hiss, not His
 2020-04-27 09:56:52 -04:00
Aronai Sieyes
c2e8ff0761 Merge pull request #7475 from VOREStation/vplk-fix-light-movement 
Fix /Moved() that doesn't call parent.
 2020-04-27 09:54:06 -04:00
Aronai Sieyes
ec5bfa3e4b Merge pull request #7477 from VOREStation/aro-vcdbsafe 
World.time can't possibly be null, and yet...
 2020-04-27 09:53:58 -04:00
Aronai Sieyes
5f0f04bcff Merge pull request #7472 from KasparoVy/clothe-the-taurs-ffs 
Aprons & Old Poncho for Most Taurs, Fix Tesh Labcoat
 2020-04-27 09:53:13 -04:00
Arokha Sieyes
92a0f94b60 World.time can't possibly be null, and yet... 2020-04-27 01:21:35 -04:00