Commit Graph

28848 Commits

Author SHA1 Message Date
Chompstation Bot
dbc080b0db Adds ability to set up and edit idle bellymode messages 2021-03-09 16:29:45 +00:00
Razgriz
4dafc3196e Add new ability, remove shifting text 2021-03-09 00:25:34 -07:00
Razgriz
abf01dba51 Merge pull request #1527 from kcin2001/paidrone
adds construction drone sprite to pai chassis
2021-03-08 22:24:11 -07:00
kcin2001
dc94d8177d adds construction drone sprite to pai chassis
does what it says on the tin, no unique vore sprite just like the normal drone
2021-03-08 20:49:17 -08:00
Nadyr
61d14c5ace Merge pull request #1522 from CHOMPStationBot/upstream-merge-9876
[MIRROR] [MIRROR] Fixed/generalized loadout implants.
2021-03-08 23:32:43 -05:00
Novacat
955be2e5fe Merge pull request #9876 from VOREStation/upstream-merge-7953
[MIRROR] Fixed/generalized loadout implants.
2021-03-08 16:53:20 +00:00
Novacat
ebf0391948 Merge pull request #9865 from Heroman3003/sizespace-suit
Adds HYPER suit
2021-03-08 16:06:23 +00:00
Nadyr
be75595852 Merge pull request #1514 from CHOMPStationBot/upstream-merge-9858
[MIRROR] [MIRROR] Stair tweaks
2021-03-07 23:41:18 -05:00
Nadyr
a60540a9e6 Merge pull request #1512 from CHOMPStationBot/upstream-merge-9862
[MIRROR] Restricts some size-mechanics with prefs
2021-03-07 22:23:08 -05:00
Nadyr
81c2f9dac9 Merge pull request #1510 from Holdelta/MiningAdditions
Mining additions
2021-03-07 22:09:06 -05:00
Nadyr
d2077d8abf Merge pull request #1516 from CHOMPStationBot/upstream-merge-9873
[MIRROR] [MIRROR] Diet/Allergy Rework & Refactor Pt2
2021-03-07 21:56:32 -05:00
Nadyr
2beb66357e Merge pull request #1515 from CHOMPStationBot/upstream-merge-9874
[MIRROR] [MIRROR] Fix stacking machine not stacking most materials
2021-03-07 21:48:02 -05:00
Nadyr
c4f0585fc6 Update vorepanel_vr.dm 2021-03-07 21:14:41 -05:00
Nadyr
73b50bcc9d Update vore_vr.dm 2021-03-07 21:12:58 -05:00
Nadyr
8944bca569 Update living_vr.dm 2021-03-07 21:08:28 -05:00
Novacat
efd4408d5b Merge pull request #9873 from VOREStation/upstream-merge-7940
[MIRROR] Diet/Allergy Rework & Refactor Pt2
2021-03-07 22:01:53 +00:00
Novacat
0109cb82c3 Merge pull request #9874 from VOREStation/upstream-merge-7948
[MIRROR] Fix stacking machine not stacking most materials
2021-03-07 21:48:35 +00:00
Chompstation Bot
58eaa09d29 [MIRROR] Stair tweaks 2021-03-07 17:52:48 +00:00
Chompstation Bot
eb91e59b72 Restricts some size-mechanics with prefs 2021-03-07 17:33:18 +00:00
Novacat
82aaf56264 Merge pull request #9866 from KillianKirilenko/kk-tweaks
ERT Adds: 🌺🐦👥
2021-03-07 14:38:32 +00:00
Nadyr
f38596b023 Merge pull request #1499 from Sharkmare/kin-rework
Shadekin Content Update + Whitelists for traits
2021-03-06 23:32:39 -05:00
Nadyr
e8473fbfb1 Merge pull request #1509 from CHOMPStationBot/upstream-merge-9861
[MIRROR] adds cool and fun new interactable environmental object
2021-03-06 23:32:07 -05:00
Sharkmare
b208ab4862 typo 2021-03-07 05:23:20 +01:00
Sharkmare
0ce76c2737 typo 2021-03-07 05:22:52 +01:00
Test Turtle
5ff44857e0 satchel of holding added 2021-03-06 17:34:10 -08:00
Test Turtle
875c71f157 Adding and re-adding quality-of-life items to mining
Given that we are to be more action-oriented, I believe that mining could do with a few small updates from more action-oriented servers.

- Adds larger ore satchels
- Adds(re-adds?) cooldown upgrades for kinetic accelerator
- Re-adds the diamond pickaxe
2021-03-06 16:40:13 -08:00
Novacat
264c00589a Merge pull request #9861 from Screemonster/barrelsoffun
adds cool and fun new interactable environmental object
2021-03-06 23:22:46 +00:00
Novacat
41f4e2d23c Merge pull request #9864 from KillianKirilenko/kk-tweaks
🕷️ Spidersman 🕷️
2021-03-06 23:19:26 +00:00
cadyn
400a89c5e7 HTML tag fix 2021-03-06 10:22:02 -08:00
cadyn
9562bb7b17 Quick fixes + Cleanliness
Got rid of the nasty switch block in the handle_shade and replaced it with two variables set by the traits. Fixed spelling, added ..() to the apply for the shadekin traits so they apply properly. Added a check to make sure players don't spawn with traits their species shouldn't have.
2021-03-06 10:17:54 -08:00
Sharkmare
546b39a395 Putting whitie and black togehter apparently breaks
So its a code block of its own
2021-03-06 17:54:16 +01:00
Sharkmare
70299a1046 Unifying how to check for kin type
Was checking a string before with color,, now instead we are checking against the ints that are associated with specific vvariables.
2021-03-06 17:41:21 +01:00
Sharkmare
06d969a967 Species whitelist for traits
Tunes up the trait system to have a whitelist AND a blacklist so you can choose whichever makes you have to write the lowest amount of code
2021-03-06 17:23:41 +01:00
Nadyr
9f3cc71232 Merge branch 'master' into upstream-merge-9856 2021-03-06 05:52:06 -05:00
Nadyr
ffcae635b0 Merge pull request #1502 from CHOMPStationBot/upstream-merge-9853
[MIRROR] Fixes vorepanel accessibility requirements
2021-03-06 05:44:50 -05:00
Nadyr
971ac1ff40 Update vorepanel_vr.dm 2021-03-06 05:32:31 -05:00
Nadyr
b1a47140e1 Merge pull request #1501 from CHOMPStationBot/upstream-merge-9852
[MIRROR] Crosses out mime/clown options if you aren't whitelisted for them
2021-03-06 05:29:15 -05:00
Nadyr
8096927ef4 Merge pull request #1492 from CHOMPStationBot/upstream-merge-9848
[MIRROR] Fixing traits left display
2021-03-06 05:28:12 -05:00
Nadyr
7fcacaeef1 Merge branch 'master' into upstream-merge-9828 2021-03-06 05:11:00 -05:00
Nadyr
b08d8d5aa1 Merge pull request #1307 from CHOMPStationBot/upstream-merge-9690
[MIRROR] [MIRROR] Adds Decapod borg sprites
2021-03-06 03:55:04 -05:00
Nadyr
a6897944c6 Update station.dm 2021-03-06 03:39:45 -05:00
Nadyr
461e0939c9 Update station.dm 2021-03-06 03:37:58 -05:00
Nadyr
a381e25117 Update neutral.dm 2021-03-06 03:10:44 -05:00
Nadyr
fe12828ed1 Merge branch 'master' into upstream-merge-9850 2021-03-06 03:09:44 -05:00
Nadyr
49d8ede34f Merge branch 'master' into upstream-merge-9751 2021-03-06 02:31:39 -05:00
Nadyr
dc7893eee2 Merge pull request #1443 from CHOMPStationBot/upstream-merge-8808
[MIRROR] FBP Munchies
2021-03-06 02:17:37 -05:00
Nadyr
3bd7e2b888 Merge pull request #1320 from CHOMPStationBot/upstream-merge-9704
[MIRROR] [MIRROR] Telecrystals are only stored on the mind
2021-03-06 01:31:07 -05:00
Nadyr
f583753342 Update Chemistry-Reagents-Food-Drinks.dm 2021-03-06 01:23:32 -05:00
Nadyr
94b413bde8 Update neutral.dm 2021-03-06 01:06:36 -05:00
Nadyr
c0dee1331a Update YW edit 2021-03-06 01:04:54 -05:00