Commit Graph
42189 Commits
Author SHA1 Message Date
Aronai Sieyes e52031d6aa Make stack amount var private 2021-08-19 21:06:46 -04:00
Aronai SieyesandGitHub 9d28e09548 Merge pull request #11450 from Very-Soft/slugcat
Catslugs and Simplemob QoL
2021-08-19 18:48:51 -04:00
Aronai SieyesandGitHub c17c628b81 Merge pull request #11449 from VOREStation/upstream-merge-8182
[MIRROR] New Shotguns/Rifles
2021-08-19 17:02:21 -04:00
Aronai SieyesandGitHub a52880c0dd Merge pull request #11442 from GhostActual/baggage
Fulpstation Briefcases
2021-08-19 17:01:52 -04:00
VerySoft 9b47f0f97c porl 2021-08-19 14:57:10 -04:00
Aronai SieyesandGitHub c2ffed3693 Merge pull request #11441 from GhostActual/labcoats
Fulpstation Labcoats
2021-08-19 14:26:31 -04:00
klaasjared 14b342c8c7 Base Commit 2021-08-19 13:15:20 -04:00
Aronai Sieyes 1543f926df Fix mysterious conflict 2021-08-19 13:09:28 -04:00
Aronai SieyesandGitHub 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 SieyesandGitHub d8537ad704 Merge pull request #11439 from PastelPrinceDan/rdlabcoat
Ports RD labcoat from CitRP
2021-08-19 12:20:09 -04:00
Aronai SieyesandGitHub 62faf2a0ba Merge pull request #11438 from Torque4607/dwoop
Adds *dwoop to all synths.
2021-08-19 12:19:33 -04:00
Aronai SieyesandGitHub f7a6d60c30 Merge pull request #11431 from VOREStation/Arokha/rolloversafety
Add rollover safety check
2021-08-19 11:08:56 -04:00
VerySoft ff13d51b52 Catslugs and Simplemob QoL
Adds Catslug mob!
-Can pick up and use/throw many things.
-Can ventcrawl, can carry various materials and objects into the vents
-Speaks in sign
-Can eat and be fed foods, which allows them to naturally heal from injuries.

Also makes it so:
-All simplemobs understand galactic common without being able to speek it regardless of other settings or languages unless otherwise disabled with the understands_common var, for facilitating RP mostly, since there's basically no situation I can think of where I would prefer that a player controlled mob couldn't at least understand common.
-Simplemobs with hands can pick up and handle micros like human mobs can.
-Simplemob grabs will now disappear appropriately when dropped rather than waiting for when they feel like it.
2021-08-19 04:19:02 -04:00
MistakeNot4892andVirgoBot d8ecba95f3 New Shotguns/Rifles 2021-08-19 01:23:03 -04:00
MistakeNot4892andVirgoBot e379fcf7e4 Merge pull request #8216 from Cerebulon/randomvend
Randomized Vendor Spawners for Mapping
2021-08-19 00:58:09 -04:00
klaasjared 2ff0b4a125 Bonus Pens
Wanted to add these neat looking pens since its related to the briefcases.
2021-08-18 02:50:08 -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
Alex c1b545b9d7 adds emote decl 2021-08-16 23:20:21 -05:00
NovacatandGitHub 181a26b039 Merge pull request #11434 from MisterGrimm/XenomorphOverhaul
Fixes minor corrosive acid bug
2021-08-16 23:19:37 -04:00
VerySoft 95736c813e Some fixes and and another airlock 2021-08-16 21:58:51 -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
NovacatandGitHub 70a98e8822 Merge pull request #11395 from lbnesquik/Kot-restart
Increase the round restart timer from 3 to 4
2021-08-16 18:17:21 -04:00
VerySoft e1ec5445e9 Stone bone axe fixxy
It uses the wrong sprite!
2021-08-16 18:04:48 -04:00
Aronai Sieyes fa8311ed97 Add rollover safety check 2021-08-16 16:31:38 -04:00
Aronai SieyesandGitHub cd0b9e0213 Merge pull request #11427 from Very-Soft/sheeps
Adds in Sheep vore mob take 2
2021-08-16 12:04:28 -04:00
Aronai SieyesandGitHub b0ac3188ae Merge pull request #11426 from GhostActual/stun-revolvers
Stun Revolver (Virgo Edition)
2021-08-16 12:03:58 -04:00
Aronai SieyesandGitHub 440c3d54f5 Merge pull request #11425 from PastelPrinceDan/foxtail
Ports CitRP's fox tail
2021-08-16 12:02:29 -04:00
Aronai SieyesandGitHub e8adb9eb23 Merge pull request #11424 from PastelPrinceDan/coatfix
Fixes Pandora029's fluff winter coat + quick tweak on it.
2021-08-16 12:01:59 -04:00
Aronai SieyesandGitHub a8bf24b119 Merge pull request #11103 from Very-Soft/rocks
Survival crafting stuff
2021-08-16 12:00:42 -04:00
klaasjared f1ae828b5f Small Fix 2021-08-16 10:29:51 -04:00
VerySoft 40a37a814a Adds in Sheep vore mob.
I don't really know how to submit a pull request to the other PR so I just fixxed it here. 

I touched up H0lySquirr3l's PR here: https://github.com/VOREStation/VOREStation/pull/11325

I also added the necessary code to make shearing these work, though, it requires the Teppi PR to function, and needs the sprites for shorn sheep, since I know that's a thing that was wanted, so it's commented out right now.
2021-08-15 21:21:51 -04:00
klaasjared aa0356371c Large Fix
Duplicate code found and deleted from code file that was adding double the stun revolvers to the SecTech vendor.
2021-08-15 18:12:54 -04:00
klaasjared c01648b55f Base Commit 2021-08-15 18:00:11 -04:00
PastelPrinceDan 4bceddd38f woo tail woo 2021-08-15 13:55:52 +01:00
PastelPrinceDan 3741b3e7f2 fixes the hood woo yea
i forgot the fucking hoodtype var please kill me
2021-08-15 13:14:36 +01:00
VerySoft 8b04267349 Tidy! 2021-08-15 07:12:31 -04:00
Aronai SieyesandGitHub be15c653eb Merge pull request #11403 from VOREStation/Arokha/plains
Port a few POIs from Chomp for big critters on Plains
2021-08-15 01:10:05 -04:00
Aronai SieyesandGitHub 2a0533d05f Merge pull request #11409 from VOREStation/upstream-merge-8191
[MIRROR] Adds Teshari legwraps
2021-08-15 01:09:49 -04:00
Aronai SieyesandGitHub 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 SieyesandGitHub 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 SieyesandGitHub b8ab5f9a59 Merge pull request #11418 from Verkister/squeak
Adds squeaky toy noise as audible emote.
2021-08-15 01:02:33 -04:00
Aronai SieyesandGitHub fd8da95ec7 Merge pull request #11408 from VOREStation/upstream-merge-8178
[MIRROR] Stun Revolver Update
2021-08-15 01:00:11 -04:00
Aronai SieyesandGitHub 0b8305ff4a Merge pull request #11417 from GhostActual/minervend
Mining Vendor
2021-08-15 00:59:03 -04:00
Aronai Sieyes e2f0b8cafa Fix icon placement 2021-08-15 00:58:23 -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
Aronai SieyesandGitHub 9455ce1b10 Merge pull request #11404 from VOREStation/Arokha/fridge
Fridge/wall locker animation fixes
2021-08-15 00:46:13 -04:00
VerySoft 55f2a50caf tiny 2021-08-14 20:32:52 -04:00
VerySoft 78c70d191b A couple of last little tweaks~ 2021-08-14 20:23:19 -04:00