Commit Graph

9319 Commits

Author SHA1 Message Date
Casey
086f935e85 Merge pull request #11526 from Very-Soft/spawner
Update mob spawners/spawns
2021-09-23 23:21:25 -04:00
Casey
51ebc41ee1 Merge pull request #11524 from GhostActual/boxed
Boxing Day
2021-09-23 23:20:55 -04:00
VerySoft
4c6885a50f Update mob spawners/spawns
Teppi can rarely spawn on Virgo 3b now after an incident where they were released and able to survive. 

This also makes it so that gaslamps, geese, and teppi are all in the same spawn pools and such, with gaslamps being 3 times as likely as geese, and teppi being very rare, this will result in the odd goose outside of the wilderness, but, geese are easy to beat up and slow, so, that's probably fine, especially considering how few spawns there are outside of the wilderness.
2021-08-29 07:14:00 -04:00
klaasjared
4f0c0bb747 Secondary Commit 2021-08-29 00:54:47 -04:00
Sym
13cc171842 DO'H
I don't know why I thought that was a good idea.
2021-08-28 17:57:33 -04:00
Sym
0e45d5ddea Overhauls Resin ability, deletes unused xeno sprites, fixes few things. 2021-08-28 17:31:01 -04:00
Verkister
6c6105379d Fixes radio headset sound toggle not working
Also makes them a little less loud.
2021-08-27 18:27:54 -04:00
Aronai Sieyes
8c90e32ef3 Fix annoying runtime with exosuit fab 2021-08-26 19:51:00 -04:00
Aronai Sieyes
fd751928e5 Merge pull request #11499 from VOREStation/upstream-merge-8233
[MIRROR] Ports sliding things along tables
2021-08-26 16:17:18 -04:00
Aronai Sieyes
7ee6009e5e Merge pull request #11498 from VOREStation/upstream-merge-8240
[MIRROR] Vending machine throwing tweaks
2021-08-26 14:01:32 -04:00
Aronai Sieyes
8557966aee Adapt for virgo code 2021-08-26 13:57:19 -04:00
Aronai Sieyes
c64af7bd6c Merge pull request #11497 from VOREStation/upstream-merge-8239
[MIRROR] Makes Fumo Un-Huge
2021-08-26 13:37:53 -04:00
Aronai Sieyes
f111b977f6 Fix merge 2021-08-26 13:33:06 -04:00
Aronai Sieyes
668ffdd90d Merge pull request #11495 from VOREStation/upstream-merge-8242
[MIRROR] Adds Headset Radio Sounds
2021-08-26 13:25:20 -04:00
Aronai Sieyes
1b54a180e0 Fix merge 2021-08-26 13:09:33 -04:00
Aronai Sieyes
794fae8235 Merge pull request #11493 from VOREStation/upstream-merge-8241
[MIRROR] Sleep Tight Disky
2021-08-26 12:52:54 -04:00
Ghost Actual
4bb386e166 Expanding Clothing Options (#11466)
* Base Commit

* Second Commit

* Third Commit

* Fourth Commit

* Fifth Commit

* Sixth Commit

* Seventh Commit

* Final (?) Commit

* Small Fix

* Small Fix

* Merge Fix

* Small Fix

* Additional Goods

* Small Fix
2021-08-26 11:43:44 -04:00
Aronai Sieyes
e5c108269d Merge pull request #11454 from VOREStation/Arokha/stacks
Make stack amount var private
2021-08-26 11:38:33 -04:00
MistakeNot4892
a20a6e9bc0 Vending machine throwing tweaks 2021-08-25 21:46:30 -04:00
MistakeNot4892
b25ed28367 Makes Fumo Un-Huge 2021-08-25 21:46:23 -04:00
MistakeNot4892
ac8ff7a5bd Merge pull request #8242 from Cerebulon/radiosounds
Adds Headset Radio Sounds
2021-08-25 21:45:08 -04:00
MistakeNot4892
2ad341babf Merge pull request #8241 from Cerebulon/disky
Sleep Tight Disky
2021-08-25 21:44:52 -04:00
Novacat
1c8f196c83 Merge pull request #11478 from VOREStation/upstream-merge-8228
[MIRROR] Added tabloid magazines.
2021-08-25 09:18:57 -04:00
VerySoft
b31effa630 Better formatting so Aro doesn't beat me up 2021-08-23 07:35:08 -04:00
VerySoft
25894314d3 Adds the ability to ban people from ghost roles
There are some mobs you can play as now that are PRETTY ABUSABLE, and there's some players who play fine normally, but get into trouble and take things too far when you put them in special roles, SO! Rather than just flat banning those people from the server, it would be cool if we could just, ban them from playing those roles. 

This should help with that.
2021-08-23 06:32:54 -04:00
Schnayy
224650ae4a Added tabloid magazines. 2021-08-22 20:24:02 -04:00
Hatterhat
bfac91465b Crusher Gaming (#11462)
* [the who - baba o'riley plays in the background]

* i need more POWER

* rewrite pt1

* bug fixo

* uh oh! they're obtainable!

* verbs

* knif

* furthur cleanup

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2021-08-22 15:18:12 -04:00
Aronai Sieyes
9c2f8d371d Merge pull request #11464 from GhostActual/stunrevolver_fix
Stun Revolver Fix
2021-08-22 15:07:11 -04:00
klaasjared
2f00eae45e Small Fix 2021-08-21 12:14:33 -04:00
PastelPrinceDan
5b707dba47 add coats to their respective vendors/lockers woo 2021-08-20 17:27:34 +01:00
Aronai Sieyes
e52031d6aa Make stack amount var private 2021-08-19 21:06:46 -04:00
Aronai Sieyes
a52880c0dd Merge pull request #11442 from GhostActual/baggage
Fulpstation Briefcases
2021-08-19 17:01:52 -04:00
Aronai Sieyes
441c3f15f7 Merge pull request #11446 from VOREStation/upstream-merge-8216
[MIRROR] Randomized Vendor Spawners for Mapping
2021-08-19 13:03:37 -04:00
Aronai Sieyes
d8537ad704 Merge pull request #11439 from PastelPrinceDan/rdlabcoat
Ports RD labcoat from CitRP
2021-08-19 12:20:09 -04:00
MistakeNot4892
e379fcf7e4 Merge pull request #8216 from Cerebulon/randomvend
Randomized Vendor Spawners for Mapping
2021-08-19 00:58:09 -04:00
klaasjared
1418044e6b Base Commit 2021-08-18 02:30:58 -04:00
PastelPrinceDan
60324d8ce8 labbed coat 2021-08-17 15:38:15 +01:00
Novacat
181a26b039 Merge pull request #11434 from MisterGrimm/XenomorphOverhaul
Fixes minor corrosive acid bug
2021-08-16 23:19:37 -04:00
Sym
28242a62f7 Fixes minor corrosive acid bug
Corrosive acid no longer melts both walls and floors at the same time. Whoops.
2021-08-16 21:10:35 -04:00
VerySoft
e1ec5445e9 Stone bone axe fixxy
It uses the wrong sprite!
2021-08-16 18:04:48 -04:00
Aronai Sieyes
a8bf24b119 Merge pull request #11103 from Very-Soft/rocks
Survival crafting stuff
2021-08-16 12:00:42 -04:00
Aronai Sieyes
cbc246afb9 Merge pull request #11412 from VOREStation/upstream-merge-8198
[MIRROR] Ports a ton of decorative mapping objects
2021-08-15 01:06:38 -04:00
Aronai Sieyes
2baf13f632 Merge pull request #11421 from MisterGrimm/XenomorphOverhaul
Fixes ancient corrosive acid problems for player xenomorphs, makes up to eight years worth of content unacidable
2021-08-15 01:02:41 -04:00
Aronai Sieyes
fd8da95ec7 Merge pull request #11408 from VOREStation/upstream-merge-8178
[MIRROR] Stun Revolver Update
2021-08-15 01:00:11 -04:00
Aronai Sieyes
098357d11f Fix icon paths 2021-08-15 00:57:00 -04:00
Aronai Sieyes
98163fd3fa Fix merge conflicts 2021-08-15 00:50:25 -04:00
Sym
ed7f4b9e75 Fixes corrosive acid, makes most important things unacidable
Makes pretty much anything important to the crew unacidable, fixes how acid interacts with floors.
2021-08-14 10:49:44 -04:00
Aronai Sieyes
d6fd7c37a9 Ports a ton of decorative mapping objects 2021-08-13 23:30:16 -04:00
VerySoft
6ba1086887 ALMOST DONE 2021-08-13 23:12:12 -04:00
Schnayy
ceb4488540 Stun Revolver Update 2021-08-13 18:17:21 -04:00