Commit Graph

8724 Commits

Author SHA1 Message Date
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
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
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
Novacat
9eff136dc9 Merge pull request #9063 from VOREStation/upstream-merge-7642
[MIRROR] Adds two new augments to Traitor uplink
2020-09-21 13:50:29 -04:00
Novacat
5d129b77a6 Merge pull request #9076 from VOREStation/upstream-merge-7638
[MIRROR] Remove broken, unused commcard system from communicators
2020-09-21 13:41:55 -04:00
Atermonera
a94f3189fd Remove broken, unused commcard system from communicators 2020-09-21 12:37:52 -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
Cyantime
2acf8dcbed Fix floor safe plane (#7648) 2020-09-20 06:52:42 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
ShadowLarkens
308e32c860 TGUI Agent Card 2020-09-19 22:57:51 -07:00
ShadowLarkens
bdb0dcc152 TGUI Janicart 2020-09-19 16:32:53 -07:00