cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 22:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,167 Commits 8 Branches 26 Tags
488fdf85eccdfc61c7f1c212bc9d285a04594de8
Commit Graph

17544 Commits

Author SHA1 Message Date
VerySoft
9923201e5b Adds _vr 2020-11-20 11:58:00 -05:00
Novacat
9fa95128d3 Merge pull request #9310 from Jwguy/MinorAdditions 
PosterAdds
 2020-11-18 20:27:01 -05:00
Verkister
88e1252874 Properly fixes the resleeving color issue 
The previous fix only fixed the reading part for the first UpdateAppearance call. This one fixes the writing part for regenerating the dna.
 2020-11-17 23:39:08 +02:00
Silver
a27a748b33 PosterAdds 
Adds five new posters
 2020-11-15 18:57:07 -06:00
Amy
5d0d3bb38d Merge branch 'master' of https://github.com/VOREStation/VOREStation into nikki-fluff 2020-11-14 12:55:04 -06:00
Unknown
f6fc13003b Balance fixes and bugfixes 
- Adjusts some of the contents of the ERT ship.
- Fixes mercenary coms not working
- Hopefully! Fixes antag coms not working
- Fixes uplinks not deducting telecrystals when things are bought
 2020-11-14 12:20:46 -05:00
ShadowLarkens
81e70a3c4d Merge remote-tracking branch 'upstream/master' into upstream-merge-7454 2020-11-13 23:13:01 -08:00
Novacat
df1b78d14a Merge pull request #8848 from Cyantime/spaceweirdness 
Remove gravity from debris field and rogue mining zones
 2020-11-14 01:48:41 -05:00
Novacat
1cd7a1fef0 Merge pull request #8900 from Heroman3003/great-alt-titling 
Adds a ton of potential fluff alt-titles
 2020-11-14 01:46:15 -05:00
Amy
1008e4cc95 HOLY FUCK THE HAT WORKS 2020-11-11 19:48:44 -06:00
Verkister
80f6493755 Merge pull request #9286 from Very-Soft/eventvendors 
Event vendors and entertainer's vendor
 2020-11-08 19:04:48 +02:00
Verkister
d771a57663 Merge pull request #9288 from VOREStation/upstream-merge-7701 
[MIRROR] Adds the Frostbelle
 2020-11-08 19:04:32 +02:00
Verkister
0841aacdac Merge pull request #9287 from VOREStation/upstream-merge-7629 
[MIRROR] Fresh Meat, Leatherworking
 2020-11-08 19:04:02 +02:00
Atermonera
30dca5e070 Merge pull request #7743 from greggbot/genetics-fix 
Moves the varset for DNA injector readying out of the for loop
 2020-11-07 15:24:03 -05:00
Atermonera
983790fa6d Merge pull request #7701 from Mechoid/Frostbelle 
Adds the Frostbelle
 2020-11-07 15:20:42 -05:00
Mechoid
019926cbc7 Fresh Meat, Leatherworking 2020-11-07 15:08:04 -05:00
VerySoft
81e53a75fe Event vendors first pass 
adds expanded vendors for use in events, also adds an entertainer costume vendor, which is mostly the same as the normal one, but without the costs for costumes, hidden in the entertainer's back room.
 2020-11-07 14:32:58 -05:00
Shadow-Quill
a82521cab5 No more unnearsightedness! (#7753) 
* No more unnearsightedness!

* Oops

* Oops pt 2
 2020-11-04 13:27:03 -05:00
Verkister
0639ec6ac6 Merge branch 'master' into spaceweirdness 2020-10-31 21:21:46 +02:00
Detective Google
67513cb402 adds comfy little cabin pods 2020-10-30 14:54:12 -05:00
Atermonera
cf5f84f711 Adds AlliCo Grab-A-Gift 2020-10-30 00:49:05 -04:00
Verkister
c6a9a08635 Merge pull request #9189 from KillianKirilenko/kk-ships 
Salamander Trader
 2020-10-28 20:36:38 +02:00
Verkister
8b5e12db6a Merge branch 'master' into tgui_character_directory 2020-10-28 14:53:12 +02:00
Verkister
b0b9dd0430 Merge pull request #9258 from VOREStation/Verkister-patch-3 
Fixes 0 RGBs breaking character colors on resleeve
 2020-10-28 09:10:58 +02:00
Verkister
7574cf1dde Merge pull request #9259 from Cyantime/patch-3 
Enables OOC during votes
 2020-10-28 09:10:43 +02:00
Cyantime
c15a2be008 Enables OOC during votes 2020-10-28 01:42:01 -04:00
ShadowLarkens
af300cc037 This is *not* what _onclick is for FFS 2020-10-27 16:10:48 -07:00
Verkister
c9c787272b Fixes 0 RGBs breaking character colors on resleeve 
math is hard
 2020-10-28 00:33:37 +02:00
Verkister
da61bc2511 Merge pull request #9253 from VOREStation/upstream-merge-7748 
[MIRROR] Adds new balloons
 2020-10-27 10:17:27 +02:00
Verkister
44830393fc Merge pull request #9225 from VOREStation/upstream-merge-7708 
[MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 10:15:15 +02:00
Schnayy
41365c5634 Adds new balloons 2020-10-25 07:34:32 -04:00
Killian
383b14f0e7 Merge remote-tracking branch 'upstream/master' into kk-ships 2020-10-20 13:20:11 +01:00
ShadowLarkens
f9fd9b7c35 Datum Component System (/tg/ port) 2020-10-18 12:13:28 -07:00
Verkister
f4fff9aa7c Update airlock_controllers.dm 2020-10-18 16:08:20 +03:00
Verkister
9f94f164c6 Update status_display.dm 2020-10-18 16:00:15 +03:00
Verkister
7bffcf4ea2 Merge pull request #9242 from VOREStation/upstream-merge-7724 
[MIRROR] Wall Cabinets & Crate Markings
 2020-10-18 15:57:44 +03:00
Verkister
d6be6c90ad Merge pull request #9235 from VOREStation/upstream-merge-7726 
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
 2020-10-18 15:57:07 +03:00
Verkister
541e85f8c0 Update walllocker.dm 2020-10-18 15:37:36 +03:00
Verkister
fc9a5e0127 Merge pull request #9229 from VOREStation/upstream-merge-7715 
[MIRROR] adds VR thunderdome to CentComm area
 2020-10-18 15:29:31 +03:00
Verkister
ab84aca7f9 Merge pull request #9227 from VOREStation/upstream-merge-7714 
[MIRROR] Adds sifgrass floor tiles. Grass tiles spawn greengrass
 2020-10-18 15:28:44 +03:00
Verkister
0954f055d5 Update buttons.dm 2020-10-18 15:28:01 +03:00
Verkister
07df3c1346 Merge pull request #9217 from AmayaWah/flora-again 
Creates proper names and descriptions for sprites found in amayastuff.dmi.
 2020-10-18 15:13:51 +03:00
Killian
109135a35a Wall Cabinets & Crate Markings 2020-10-17 08:54:28 -04:00
Meghan-Rossi
3634234788 Fix most borosilicate shards disappearing instantly after being made (#7726) 
*Fixed borosilicate glass not producing shards in most situations.
 2020-10-17 06:06:15 -04:00
SubberTheFabulous
ea30bf3401 adds VR thunderdome to CentComm area (#7715) 
* Adds a VR Thunderdome

* Adds VR Thunderdome Vendors

* Adds VR Area

* Adds VR Thunderdome Area

* Adds VR Thunderdome area

This time without upsetting Travis, I guess.

* Adds VR Thunderdome Area

This time for sure, probably, I hope.
 2020-10-17 02:07:24 -04:00
Atermonera
125ef651c8 Adds sifgrass floor tiles. Grass tiles spawn greengrass (#7714) 2020-10-17 02:05:55 -04:00
Meghan-Rossi
de36b996b9 Makes wall-mounted machines layer above windows 2020-10-17 02:03:26 -04:00
Novacat
2e782bfd50 Merge pull request #9218 from Meghan-Rossi/records 
Fix TGUI bluescreens for medical, security records
 2020-10-14 12:02:37 -04:00
Amaya
4d9bc5fa19 AGAIN 2020-10-14 15:42:46 +02:00
Meghan-Rossi
666210215a Fix TGUI bluescreens for medical, security records 
Fixes https://github.com/VOREStation/VOREStation/issues/9214
 2020-10-14 12:33:52 +01:00