Commit Graph

28623 Commits

Author SHA1 Message Date
Casey
bcd2afd09c Merge pull request #12048 from Verkister/ponyshow2
Fixes riding offsets not counting rider size
2022-01-08 12:53:52 -05:00
Casey
6a2b3120c4 Merge pull request #12047 from Heroman3003/bellybreath
Makes Vox and Zaddat capable of breathing and not dying when in stomachs
2022-01-08 12:53:36 -05:00
Casey
5f39c94e8c Merge pull request #12045 from Enzo-Leon/altevian-002
Air Traffic Adjustments
2022-01-08 12:52:59 -05:00
Casey
62a6177d87 Merge pull request #12044 from TheDavestDave/dnd-explo-amour
Dnd explo amour
2022-01-08 12:51:32 -05:00
Casey
ad69088a90 Merge pull request #12040 from PastelPrinceDan/beretfix
fixes qm beret name
2022-01-08 12:43:31 -05:00
Casey
429b88f66b Merge pull request #12036 from Heroman3003/ore-rebalance
Makes deeper ore areas for deep drilling contain ores of all types at higher amounts, not just rare ones
2022-01-08 12:42:55 -05:00
Casey
8c7921cbb8 Merge pull request #12035 from Verkister/neckfluf
Adds secondary color layer to neckfur "wings"
2022-01-08 12:42:42 -05:00
Casey
89d5b8ec9c Merge pull request #11944 from Heroman3003/nifnerf
Makes NIFs not get automatically lost (hopefully)
2022-01-08 12:39:30 -05:00
Verkister
7cae8d2016 Fixes riding offsets not counting rider size
Fixes riding offsets not counting rider size or the difference between the two, which would end up resulting in small riders on large mounts sitting nowhere near the back of the mount
2022-01-08 18:45:06 +02:00
Heroman
cac23937e1 Makes Vox and Zaddat capable of breathing and not dying when in stomachs 2022-01-07 06:32:21 +10:00
Anthony Rodriguez
77ae93e9ae Air Traffic Adjustments 2022-01-04 12:50:26 -08:00
TheDavestDave
b1a23cad0c adds loadout alt to explo green suit
makes it a real item, adds it to load out. It has copy pasted stats to the green suit explo has.
2022-01-04 16:05:21 +00:00
TheDavestDave
1251cad335 adds explo knight amour as a thing 2022-01-04 00:04:47 +00:00
PastelPrinceDan
d60d6fed0c aeoeoeoe 2022-01-02 20:12:21 +00:00
Heroman
df8af72001 Makes deeper ore areas for deep drilling contain ores of all types at higher amounts, not just rare ones 2021-12-29 19:43:33 +10:00
Verkister
427c50c1c9 Adds secondary color layer to neckfur "wings"
Only for the wingless neckfur though since the winged ones already had their tertiary color slots taken.
2021-12-28 19:06:47 +02:00
Heroman
9106a08f1a Makes NIF save on every durability change 2021-12-26 05:57:32 +10:00
Casey
8eefb0ba71 Merge pull request #12027 from Very-Soft/adventuretime
Revamps adminbus portals
2021-12-22 08:57:46 -05:00
Casey
ad38af2363 Merge pull request #12026 from VOREStation/upstream-merge-8361
[MIRROR] Adds checking on target to mob shoot_target proc.
2021-12-22 08:57:13 -05:00
Casey
b19948a083 Merge pull request #12021 from Heroman3003/more-absorb-vore
Adds more absorbs-related vore messages and rearranges vore panel a bit
2021-12-22 08:53:57 -05:00
Casey
55c757e3d3 Merge pull request #12019 from Verkister/patch-106
Makes micros scoopable by smols
2021-12-22 08:53:19 -05:00
Casey
59e84dbcb8 Merge pull request #12012 from Hatterhat/rad-apes-real
rad apes real
2021-12-22 08:48:34 -05:00
VerySoft
15b6f8ec47 Revamps adminbus portals
Automates the connection process a little based on how bluespace rifts work.

They also allow the portals to be linked to other portals without recursive portal-ing, or plopping people into walls or other obstructions. (It doesn't account for other conditions though, so if you put a portal next to lava or a horrible sky fall, that's on you). It only puts them immediately adjacent to linked portals or otherwise obstructed target locations.

Basically though, if there is an unlinked portal,  a staff member can click it, they get a dialogue box with some instructions. They can then fly off to where they want the linked portal to go, click the appropriate options, and it will automatically set it up for you. You can select a sister portal, or just a target. Selecting a portal in this way also brings up options for the portal's sprite too, in case you don't have your own~

This should make setting up events that use the portals a little easier.
2021-12-22 08:38:22 -05:00
Atermonera
0106e54f25 Merge pull request #8361 from MistakeNot4892/master
Adds checking on target to mob shoot_target proc.
2021-12-19 22:57:26 -05:00
Heroman
15658819d9 Adds more absorbs-related vore messages and rearranges vore panel 2021-12-19 11:31:25 +10:00
Verkister
feab9a0212 Makes micros scoopable by smols
Fixes 25% size micros not being scoopable by anyone in 50%-74% range.
2021-12-16 21:15:34 +02:00
Hatterhat
8723d1b999 it compiled (tm) 2021-12-15 19:10:18 -06:00
Little-119
2a092574d8 Merge branch 'master' into ckey-transfer 2021-12-13 20:42:12 -05:00
Casey
14b18e840a Merge pull request #12002 from Heroman3003/bsh-2
More fixes/adjustments for BSH
2021-12-11 08:58:18 -05:00
Heroman
fc36eec91e Makes messages for climbing up/down rafters a bit more obvious 2021-12-11 18:56:17 +10:00
Heroman
12546cd5d6 More fixes/adjustments for BSH 2021-12-11 17:46:09 +10:00
Casey
4c8eeb2f3d Merge pull request #11999 from Hatterhat/mask-radial
paper/joymask radial gaming
2021-12-10 22:44:12 -05:00
Casey
0011a0430d Merge pull request #11997 from Heroman3003/hydro-icon-fixes
Fixes some issues with icons in hydroponics
2021-12-10 22:43:48 -05:00
Casey
0a89b6c58a Merge pull request #11994 from Heroman3003/chocc
Makes Universal Enzyme inhibit choccy milk reaction
2021-12-10 22:43:27 -05:00
Hatterhat
f0a14ba099 radial gaming 2021-12-10 00:10:52 -06:00
Heroman
55dbd70112 Fixes some issues with icons in hydroponics 2021-12-10 04:49:11 +10:00
Heroman
0982194642 Makes Universal Enzyme inhibit choccy milk reaction 2021-12-09 14:32:44 +10:00
Heroman
b48c8827b9 Enables polaris ear options. 2021-12-09 14:29:32 +10:00
Heroman
52b910b167 Fixes Elf Ears being restricted to human and event species 2021-12-09 14:23:55 +10:00
VerySoft
cf7d14b2ee You can't eat yourself, charlie brown!
Makes it so you can't eat yourself with the BSH
2021-12-08 13:18:42 -05:00
Runa Dacino
f858ca2a42 Bugfixing, style changes
Tried to make the loadout versions follow convention.

Fixed path issue with vendor, changing "/chemist" to "/chem"
2021-12-08 18:24:52 +01:00
Runa Dacino
8fad281f41 Brings back labcoats before fulp PR
While the labcoats provided by fulpstation do look rather nice, I find myself yearning for the original icons. They look "sharper", more "ironed."

At this point, I'm only bringing back departmental wear, since the coloured labcoats aren't that different. I may bring back the coloured ones too.

Labcoats were added to the vending machines too, for in-round use.

At loadout, at the moment, anyone may use the purple/green/yellow trim labcoats, as I'm yet to figure out how to do that.

However, seeing that the security poncho is available to everyone too... I think it's not an issue.
2021-12-08 17:39:27 +01:00
Casey
41cc69d9b1 Merge pull request #11970 from Heroman3003/holopower
Makes holodeck turn power on/off depending on state
2021-12-08 04:17:54 -05:00
Heroman
e11d4c62a7 Makes holodeck turn power on/off depending on state 2021-12-07 20:21:08 +10:00
Casey
7110e22129 Merge pull request #11979 from R3dtail/patch-4
Tutorial for More Door Interactions
2021-12-07 04:00:28 -05:00
Heroman
9f22fb8bf0 Fixes drop pred pref not loading properly 2021-12-07 13:52:11 +10:00
R3dtail
f5a1ec5c67 Tutorial for More Door Interactions
Because hidden features are lame.
2021-12-06 09:12:54 -06:00
Casey
9056bce30c Merge pull request #11976 from Heroman3003/toggle
Standartizes names and clarifies descriptions of Preferences Tab verbs
2021-12-06 04:52:32 -05:00
Casey
56901e1765 Merge pull request #11973 from Heroman3003/ranger-remove
Comments out color ranger helmets
2021-12-06 04:48:42 -05:00
Casey
4d48a8e8bb Merge pull request #11971 from Heroman3003/grabattack
Makes player-controlled simplemobs not do attacks when on grab intent
2021-12-06 04:48:10 -05:00