cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 21:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,177 Commits 9 Branches 26 Tags
91de1ea9d3e7db66a391afcbc8857e5bcabc7fd6
Commit Graph

5419 Commits

Author SHA1 Message Date
Verkister
b0d860b4e9 Merge pull request #9612 from VOREStation/upstream-merge-7839 
[MIRROR] Fixed global_announce autospeaker
 2021-02-10 12:10:36 +02:00
Verkister
5dd99a1257 Merge pull request #9622 from Verkister/eastercameearly 
New advanced Egg Release mechanics.
 2021-02-01 21:34:07 +02:00
Verkister
b435e756c9 Makes bellied eggs relay their struggles onto the belly. 2021-02-01 15:13:33 +02:00
Verkister
7b1c399a73 Eggy reworks and fixes 2021-01-29 14:55:17 +02:00
Verkister
af25a1b592 New advanced Egg Release mechanics. 
-The vore release eggs are no longer reskinned lockers, but storage items that can have their contents either dumped or pulled out, but the stuff can't be put back into a cracked shell.
-A live prey in an egg will have the egg scaled according to their size, and they can get out by resisting.
-Also now items can be egged, either one at a time or all at once. The single item eggs are scaled according to the contained item's size class and take the same amount of storage space as the item itself would.
-Full stuff eggs are a little more lenient on the size and weight, basically for the reason that one prey's full outfit could fit in one backpack sized egg rather than going full macro based on the total weight.
-Also there's a whole bunch of new egg type options and some better looking sprites coming.
-Also the new eggs can be picked up and even trash-eaten.
-The old locker eggs still exist in the code and can be spawned should anyone have a need for one.
 2021-01-28 13:34:18 +02:00
Nadyr
4989c4423a Fixes sif forest grass, adds overgrowth tiles (#7841) 2021-01-27 14:21:17 -05:00
Heroman
f435641051 Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy 2021-01-26 16:40:48 +10:00
Cerebulon
b6f7666e3c Fixed global_announce autospeaker 2021-01-25 20:26:44 -05:00
Mechoid
31b779b6fa Mech Appearance Update 2021-01-24 14:20:36 -05:00
Novacat
f51f6ad710 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 01:54:04 -05:00
Heroman
f03fc5f240 Fixes defib timers being 10 times as long compared to intended 2021-01-24 09:58:45 +10:00
Mechoid
02ffbbe79b Gadgets & Gizmos 2021-01-15 01:56:01 -05:00
Atermonera
e052ff9517 Sheet Recipe Unexclusivity. 2021-01-14 01:11:20 -05:00
tyger
71252ebc06 Done stuffs 
idk, im no coder
 2021-01-03 15:07:03 +01:00
tyger
fd9ae3d4ca Added drakies 
Done, problably
 2021-01-03 02:24:30 +01:00
Mechoid
40a4602d4b Adds a Whip. 2020-12-27 20:56:54 -05:00
Unknown
7ef1ffc65c Mistletoe, Vox Plushie obtainable 2020-12-25 20:16:38 -05:00
Unknown
7b25de2d8e Properly scopes visible message 2020-12-25 14:37:43 -05:00
Unknown
b09515551c Ports Vox Plushie from Paradise 
Why not?
 2020-12-25 14:34:51 -05:00
VerySoft
86478b6303 ITG IDs and a small Dauntless refit 2020-12-22 19:30:02 -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
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
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
Amy
1008e4cc95 HOLY FUCK THE HAT WORKS 2020-11-11 19:48:44 -06: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
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
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
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
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
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
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