Commit Graph

28106 Commits

Author SHA1 Message Date
Novacat
5ea37fefb1 Merge pull request #11480 from VOREStation/upstream-merge-8225
[MIRROR] Seed Contraband Changes
2021-08-23 00:11:29 -04:00
MistakeNot4892
6546973e75 Merge pull request #8226 from Schnayy/nameloopfix
Fixes infinite naming loop
2021-08-22 23:27:06 -04:00
MistakeNot4892
45c30815b8 Merge pull request #8225 from Schnayy/seedupdate
Seed Contraband Changes
2021-08-22 23:26:59 -04:00
Hatterhat
cb05e053a5 helLO i forgot to change an icon name 2021-08-22 16:08:49 -05: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
e5bcc628fd Merge pull request #11469 from PastelPrinceDan/clothingwooyeah
Port some more clothes from CitRP + updates 'off' sprite for mesons & co to match new style.
2021-08-22 15:10:18 -04:00
Aronai Sieyes
9c2f8d371d Merge pull request #11464 from GhostActual/stunrevolver_fix
Stun Revolver Fix
2021-08-22 15:07:11 -04:00
Aronai Sieyes
b97ec94446 Merge pull request #11463 from Very-Soft/catslugtime
Makes catslugs slightly less annoying
2021-08-22 15:06:38 -04:00
Aronai Sieyes
e7f034a7b3 Merge pull request #11461 from KeenShayne/VS-SetCustomSpeciesNameVBTF
Can now give custom species names during vorebelly transformations
2021-08-22 15:01:56 -04:00
Aronai Sieyes
dffcee3518 Merge pull request #11459 from PastelPrinceDan/lockercoatswoo
Adds winter coats to their respective lockers/vendors
2021-08-22 15:01:04 -04:00
Aronai Sieyes
d682b39f9e Merge pull request #11455 from KeenShayne/VS-ExpandedIdleMessages
Adds missing Idle Messages for all stomach modes in vore panel
2021-08-22 15:00:39 -04:00
VerySoft
5fc91e3eb6 Makes them slightly more annoying. But also able to be picked up. 2021-08-22 04:13:24 -04:00
PastelPrinceDan
0981f9d1d3 more fixes grr i hate / 2021-08-22 05:22:19 +01:00
PastelPrinceDan
ccb6a7cb17 woo yeah fix 2021-08-22 05:18:46 +01:00
PastelPrinceDan
ea8bc0f300 clo tth ee s 2021-08-22 03:51:25 +01:00
VerySoft
d791d14059 This too! For maint nest QOL 2021-08-21 18:35:46 -04:00
VerySoft
7ce49acf09 Updoot! Also expands ventcrawl allowed list 2021-08-21 06:20:01 -04:00
klaasjared
7601d77eb0 Base Commit 2021-08-21 02:30:39 -04:00
KeenShayne
87d998dad0 Sanitizes input
Follows similar procedure to setting custom race name in the character setup panel.
2021-08-21 00:59:08 -04:00
VerySoft
ccaebcbd7f Makes catslugs slightly less annoying
Now they ONLY respond to psps, rather than everything except psps except when they are kicking your ass.

Also makes it so simplemobs get up to kick your ass if you attack them when they are resting.
2021-08-21 00:49:09 -04:00
KeenShayne
c488222abe Fixes dumb code mistake
You kinda need to call input for users to input...
2021-08-20 19:21:53 -04:00
KeenShayne
e9ce100942 Can now give custom species names during vorebelly transformations 2021-08-20 18:41:42 -04:00
PastelPrinceDan
5b707dba47 add coats to their respective vendors/lockers woo 2021-08-20 17:27:34 +01:00
KeenShayne
ec50ff35f0 Fixes PAI deleting devoured things
PAI now "vomits" contents before dying or being deleted.
2021-08-20 03:44:45 -04:00
KeenShayne
419f6471ac Adds missing Idle Messages for all stomach modes
Allows you to set idle messages for all stomach modes in the vore panel
2021-08-19 21:23:15 -04:00
Aronai Sieyes
9d28e09548 Merge pull request #11450 from Very-Soft/slugcat
Catslugs and Simplemob QoL
2021-08-19 18:48:51 -04:00
Aronai Sieyes
c17c628b81 Merge pull request #11449 from VOREStation/upstream-merge-8182
[MIRROR] New Shotguns/Rifles
2021-08-19 17:02:21 -04:00
Aronai Sieyes
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
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 Sieyes
d8537ad704 Merge pull request #11439 from PastelPrinceDan/rdlabcoat
Ports RD labcoat from CitRP
2021-08-19 12:20:09 -04:00
Aronai Sieyes
62faf2a0ba Merge pull request #11438 from Torque4607/dwoop
Adds *dwoop to all synths.
2021-08-19 12:19:33 -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
MistakeNot4892
d8ecba95f3 New Shotguns/Rifles 2021-08-19 01:23:03 -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
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
VerySoft
95736c813e Some fixes and and another airlock 2021-08-16 21:58:51 -04:00
Aronai Sieyes
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 Sieyes
b0ac3188ae Merge pull request #11426 from GhostActual/stun-revolvers
Stun Revolver (Virgo Edition)
2021-08-16 12:03:58 -04:00
Aronai Sieyes
440c3d54f5 Merge pull request #11425 from PastelPrinceDan/foxtail
Ports CitRP's fox tail
2021-08-16 12:02:29 -04:00
Aronai Sieyes
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 Sieyes
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