87e0b3653f
Move away from Travis CI to GitHub Actions
2020-11-21 18:23:40 -08:00
575a57fa54
adds _vr for rel this time maybe
2020-11-20 12:05:15 -05:00
9923201e5b
Adds _vr
2020-11-20 11:58:00 -05:00
9fa95128d3
Merge pull request #9310 from Jwguy/MinorAdditions
...
PosterAdds
2020-11-18 20:27:01 -05:00
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
a27a748b33
PosterAdds
...
Adds five new posters
2020-11-15 18:57:07 -06:00
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
81e70a3c4d
Merge remote-tracking branch 'upstream/master' into upstream-merge-7454
2020-11-13 23:13:01 -08:00
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
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
80f6493755
Merge pull request #9286 from Very-Soft/eventvendors
...
Event vendors and entertainer's vendor
2020-11-08 19:04:48 +02:00
d771a57663
Merge pull request #9288 from VOREStation/upstream-merge-7701
...
[MIRROR] Adds the Frostbelle
2020-11-08 19:04:32 +02:00
0841aacdac
Merge pull request #9287 from VOREStation/upstream-merge-7629
...
[MIRROR] Fresh Meat, Leatherworking
2020-11-08 19:04:02 +02:00
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
983790fa6d
Merge pull request #7701 from Mechoid/Frostbelle
...
Adds the Frostbelle
2020-11-07 15:20:42 -05:00
019926cbc7
Fresh Meat, Leatherworking
2020-11-07 15:08:04 -05:00
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
a82521cab5
No more unnearsightedness! ( #7753 )
...
* No more unnearsightedness!
* Oops
* Oops pt 2
2020-11-04 13:27:03 -05:00
0639ec6ac6
Merge branch 'master' into spaceweirdness
2020-10-31 21:21:46 +02:00
67513cb402
adds comfy little cabin pods
2020-10-30 14:54:12 -05:00
cf5f84f711
Adds AlliCo Grab-A-Gift
2020-10-30 00:49:05 -04:00
c6a9a08635
Merge pull request #9189 from KillianKirilenko/kk-ships
...
Salamander Trader
2020-10-28 20:36:38 +02:00
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
7574cf1dde
Merge pull request #9259 from Cyantime/patch-3
...
Enables OOC during votes
2020-10-28 09:10:43 +02:00
c15a2be008
Enables OOC during votes
2020-10-28 01:42:01 -04:00
af300cc037
This is *not* what _onclick is for FFS
2020-10-27 16:10:48 -07:00
c9c787272b
Fixes 0 RGBs breaking character colors on resleeve
...
math is hard
2020-10-28 00:33:37 +02:00
da61bc2511
Merge pull request #9253 from VOREStation/upstream-merge-7748
...
[MIRROR] Adds new balloons
2020-10-27 10:17:27 +02:00
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
41365c5634
Adds new balloons
2020-10-25 07:34:32 -04:00
383b14f0e7
Merge remote-tracking branch 'upstream/master' into kk-ships
2020-10-20 13:20:11 +01:00
f9fd9b7c35
Datum Component System (/tg/ port)
2020-10-18 12:13:28 -07:00
f4fff9aa7c
Update airlock_controllers.dm
2020-10-18 16:08:20 +03:00
9f94f164c6
Update status_display.dm
2020-10-18 16:00:15 +03:00
7bffcf4ea2
Merge pull request #9242 from VOREStation/upstream-merge-7724
...
[MIRROR] Wall Cabinets & Crate Markings
2020-10-18 15:57:44 +03:00
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
541e85f8c0
Update walllocker.dm
2020-10-18 15:37:36 +03:00
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
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
0954f055d5
Update buttons.dm
2020-10-18 15:28:01 +03:00
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
109135a35a
Wall Cabinets & Crate Markings
2020-10-17 08:54:28 -04:00
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
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
125ef651c8
Adds sifgrass floor tiles. Grass tiles spawn greengrass ( #7714 )
2020-10-17 02:05:55 -04:00
de36b996b9
Makes wall-mounted machines layer above windows
2020-10-17 02:03:26 -04:00
2e782bfd50
Merge pull request #9218 from Meghan-Rossi/records
...
Fix TGUI bluescreens for medical, security records
2020-10-14 12:02:37 -04:00
4d9bc5fa19
AGAIN
2020-10-14 15:42:46 +02:00
666210215a
Fix TGUI bluescreens for medical, security records
...
Fixes https://github.com/VOREStation/VOREStation/issues/9214
2020-10-14 12:33:52 +01:00
cb9a30cb9f
Comma
2020-10-14 18:43:04 +10:00
ShadowLarkens