cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 11:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,786 Commits 8 Branches 26 Tags
f27bdf1dc49b85dbaa3d7cc03fc2e387ee83ca7d
Commit Graph

8735 Commits

Author SHA1 Message Date
Novacat
6ac06fcc8c Merge pull request #9456 from Very-Soft/longer-bonfires 
Makes bonfires last longer!
 2020-12-13 22:17:21 -05:00
VerySoft
8ca614dce3 Makes bonfires last longer! 
So they should last 60 minutes if filled with logs, and 30 minutes if filled with planks
 2020-12-13 21:57:54 -05:00
Hatterhat
f771cc4ce5 RPED QoL Tweak(s)/Unimplemented RPED Variant (#7784) 
* this is incredibly scuffed

* this is a monumental W bossman

* parity with downstream

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2020-12-13 19:51:54 -05:00
Novacat
162d018f97 Merge pull request #9431 from Very-Soft/abduct-u 
Abductor Ship
 2020-12-08 13:55:41 -05:00
VerySoft
ff2fb7069e Abduct-u 2020-12-08 13:10:27 -05:00
Novacat
47c4b5f66e Merge pull request #9422 from VOREStation/upstream-merge-7762 
[MIRROR] Plainleather & Tobacco
 2020-12-07 22:37:38 -05:00
Atermonera
dd1abf42c8 Merge pull request #7777 from Verkister/patch-58 
Modular honks
 2020-12-07 20:10:39 -05:00
Mechoid
b95a10af1a Plainleather & Tobacco (#7762) 
* Rebrands leather to plainleather. Add tobacco and red-caps, redwood tallcaps.

* Seedpacket

* Sinks are wet.

* User
 2020-12-07 19:50:50 -05:00
Hatterhat
7ed50074aa polaris#7778 earlyport 2020-12-07 01:34:32 -06:00
Novacat
6d85b4b854 Merge pull request #9393 from VOREStation/upstream-merge-7749 
[MIRROR] Stowaway Cryopod is now invisible, and incorporeal.
 2020-12-04 20:56:23 -05:00
VerySoft
57ddfdfb5b ITG Dauntless 
An interstellar freight and passenger frigate owned and operated by the Ironcrest Transport Group! For events and stuff!
 2020-12-02 23:31:51 -05:00
Atermonera
e6c0ecdafa Merge pull request #7749 from Mechoid/StowawayMystery 
Stowaway Cryopod is now invisible, and incorporeal.
 2020-12-02 02:28:49 -05:00
Novacat
60217c38ae Merge pull request #9333 from Tenryumi/nikki-fluff 
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
 2020-11-30 18:45:57 -05: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
Amy
1008e4cc95 HOLY FUCK THE HAT WORKS 2020-11-11 19:48:44 -06:00
Verkister
d771a57663 Merge pull request #9288 from VOREStation/upstream-merge-7701 
[MIRROR] Adds the Frostbelle
 2020-11-08 19:04:32 +02: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
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
ShadowLarkens
af300cc037 This is *not* what _onclick is for FFS 2020-10-27 16:10:48 -07: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
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
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
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
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
Amaya
4d9bc5fa19 AGAIN 2020-10-14 15:42:46 +02:00
Amaya
6cb7a5c479 adds 10 flora structures. 2020-10-01 16:55:54 +02:00
Killian
a639f767c9 talon cleanup/tweaks 2020-09-29 16:47:48 +01:00
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
e8f7b01ea4 Merge branch 'master' into kk-adminships 2020-09-27 17:02:08 -04:00
Novacat
7561a5cfd6 Merge pull request #8926 from KillianKirilenko/kk-ships 
Additional Ships
 2020-09-27 17:01:12 -04:00
Verkister
9da36f9244 earlyport cleave exploit fix 
if ya can't poke them ya don't get to slash either
 2020-09-24 11:15:39 +03:00
Killian
498debf5d3 new crate spawner 
adds a new spawner that can spawn a random empty crate, a random crate with loot, or sometimes just nothing.
 2020-09-22 12:23:28 +01: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
Rykka
534623b1fd Delete accidentally-added file from Commcard PR 2020-09-21 16:01:46 -04:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00