Commit Graph

1109 Commits

Author SHA1 Message Date
Nadyr
2ce2880fe6 Merge pull request #4112 from CHOMPStation2/upstream-merge-12604
[MIRROR] [MIRROR] Allergen CE Conversion
2022-04-18 00:33:22 -04:00
Nadyr
d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Casey
ec4b9bc914 Merge pull request #12604 from VOREStation/upstream-merge-8431
[MIRROR] Allergen CE Conversion
2022-04-17 22:41:03 +00:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
d7e57243c8 Merge pull request #12718 from FartMaster69420/span
Ports Span Macros from TG Station
2022-04-17 09:12:14 +00:00
Casey
3add9b1880 The Grand /TG Port - Part 1 2022-04-04 16:50:53 -04:00
Casey
139fae8d77 Rascal's Pass 2022-04-01 16:59:15 +00:00
Rykka
25eed899d7 Trait Tweak - Positives capped at 6, Negatives Uncapped
As above.
Traits now have an unlimited amount for negatives, given they are intended to harm you.
Positives have a cap of 6 total.
Prior to this, one could do 6 positives and two extremely expensive negatives, but no other 'fun' negatives.

Now, one can still do 6 strong positives, but as many negatives as they like.
IDEALLY this will allow for custom setups with a lot of small-cost negatives for higher cost positives.

Assuming Tankiness PR comes in before this, it will need adjusting to account for this, but, assuming one powergames to get the ABSOLUTE best traits possible (using the tankiness PR):

Positive:
High Endurance - 3
Burn Resist, Major - 3
Brute Resist, Major - 3
Increased Pain Tolerance - 2
Extreme Hardy - 3
Sharp Melee - 1

Traits Left: 0
Points Left: -15

Negative:
Reduced Biocompatability, Major - -8
Conductive Major - -3
Haemophilia - -2
Extreme Photosensitivity - -2

Points Left: 0

Extremely low healing (30% effective heals, meaning a heal for 10 will only heal 3)
Double incoming taser/electrical damage
Bleed 2x as fast
Flashes stun 2x as long. (This trait in particular is badly in need of an overhaul so it's not free points on 99% of rounds).
2022-03-29 15:35:18 -06:00
Casey
765f4cd2b3 More Upgrade Modules for Borgs 2022-03-12 20:44:57 +00:00
Casey
f37c12b6ab Complete Absorb 2022-03-11 00:07:04 +00:00
Casey
e73d113da0 7914 branch fix 2022-02-19 21:25:16 +00:00
Razgriz
d3afb10fd3 powder that makes you say yes 2022-02-13 01:25:43 -07:00
Razgriz
93c456e5d9 powder that makes you say yes 2022-02-13 01:25:12 -07:00
Casey
22d7e1b856 Tether passage blockades 2022-02-13 06:41:40 +00:00
Casey
b83034829f Merge pull request #12173 from KillianKirilenko/kk-test
Allergen Reaction Tuning
2022-02-07 23:17:12 +00:00
Casey
0495d7ab40 Adds more absorbs-related vore messages and rearranges vore panel a bit 2022-01-09 01:51:49 +00:00
Nadyr
129be4c145 Remove Squeakish 2021-12-28 12:56:33 -05:00
Nadyr
8164226256 Merge pull request #3337 from CHOMPStation2/upstream-merge-11874
[MIRROR] Adds prefs for Corgi and Cursed Sword roles
2021-12-12 06:03:10 -05:00
Nadyr
97270ba71c Merge pull request #3439 from CHOMPStation2/upstream-merge-11832
[MIRROR] mechaport gaming
2021-12-12 04:59:33 -05:00
Nadyr
5c2cdb3d5e Merge pull request #3433 from CHOMPStation2/upstream-merge-11821
[MIRROR] Adds Altevian Language & ATC Fluff
2021-12-12 04:46:37 -05:00
Casey
e773ca01c9 Merge pull request #11832 from Hatterhat/pad-booster
mechaport gaming
2021-12-10 02:51:14 +00:00
Aronai Sieyes
4b2fa3836d Adds Altevian Language & ATC Fluff 2021-12-10 01:46:15 +00:00
Casey
8f1116d29d Makes long tails not be taur butts and corrects some hair colors 2021-12-09 23:13:10 +00:00
Casey
f7fbce58c1 Merge pull request #11874 from Heroman3003/moreroleprefs
Adds prefs for Corgi and Cursed Sword roles
2021-12-08 22:49:16 +00:00
Nadyr
3f52b2ef92 powder that makes you say yes 2021-11-01 20:21:11 -04:00
Chompstation Bot
0851b4f14c Takes Stellar Delight apart 2021-11-01 21:58:31 +00:00
Chompstation Bot
da9e3383a8 Hardwood Material Port 2021-10-30 21:25:32 +00:00
Nadyr
3995a66fca Merge branch 'master' into upstream-merge-11579 2021-10-22 20:03:36 -04:00
Chompstation Bot
ffadbf101f [MIRROR] Stimulant allergen for Tajaran 2021-10-22 18:57:48 +00:00
Aronai Sieyes
dfd327faf3 Merge pull request #11572 from VOREStation/upstream-merge-8272
[MIRROR] Expands the ring selection
2021-10-22 18:40:13 +00:00
Rykka
ed798113d9 Compiler Fixes
Fixes in order:
- Removes List of defines in misc_ch.dm that are no longer used - they're defined here for the casino prize dispenser, making these obsolete:
![](https://i.imgur.com/8iCsb98.png)

- Fixes relative pathing in mecha_parts_ch.dm
- Fixes relative pathing in bodybag.dm
- Fixes relative pathing in sahoc_ch.dm
- Fixes relative pathing in toys_yw.dm
- Fixes def_zone being defined when only the variable was needed in twohanded_ch.dm
- Fixes relative pathing in trash_pile_vr_ch.dm
- Fixes clip_mask being missing in misc_ch.dm
- Fixes relative pathing in tesh_synth_facemask.dm
- Fixes absolute path being indented in by one (typo?)
- Fixes relative pathing in armor_yw.dm
- Fixes unreachable parent call in audible_scream_ch.dm
- Fixes VERM_LIZARDS being undefined when it wasn't defined, as VERM_LIZARDMEN was the variable being defined + used in mutants.dm
- Removes two un-needed parent calls - these procs have no parent on /obj/structure - thecake_ch.dm
- Fixes invalid kword nano_state in protean_blob.dm
- Fixes relative pathing in drone_manufacturer_unify.dm
- Fixes relative pathing in synx.dm
- Removes arguments of drop_item that don't exist (port was from TG and had force_drop = 1 and src defined.) - vox.dm
- Added vision_required = TRUE to fix proc argument missing - bigdragon_ch.dm
- Added include_robo = TRUE to fix argument missing in demon_ch.dm
- Fixes relative pathing in rakshasa_abilities.dm
- Adds comment to solargrub.dm, unable to fix operator overload error yet.
- Fixes relative pathing in sprite_accessories_extra_ch.dm
- Fixes relative pathing in sprite_accessories_yw.dm
- Fixes relative pathing in phase.dm
- Fixes relative pathing in bluespacecoffee.dm
- Fixes relative pathing in other_ch.dm
- Fixes relative pathing and ambigious ! in living_ch.dm
- Fixes relative pathing in custom_clothes_yw.dm
- Fixes relative pathing in custom_rigs_yw.dm
- Fixes relative pathing in MadokaSpear.dm
- Comments out duplicate #includes in southern_cross.dm as vorestation.dme has them #include'd.
2021-09-03 17:22:49 -07:00
Anthony Rodriguez
15dd652d8b Updating to reflect proper CHOMPEdit and nesting 2021-08-30 18:19:30 -07:00
Anthony Rodriguez
be2e0a0609 Altevian & Squeakish Language and ATC Addition. 2021-08-30 14:52:43 -07:00
Nadyr
25dd51d3ca powder that makes you say yes 2021-08-27 19:38:58 -04:00
Nadyr
1dbf0f46ab powder that makes you say yes 2021-08-27 19:38:03 -04:00
Razgriz
816170cdd3 Merge pull request #2806 from cadyn/cum
Make diagonal movement follow basic geometry
2021-08-26 16:57:08 -07:00
Chompstation Bot
d189c9a12f Crusher Gaming 2021-08-24 23:58:27 +00:00
Verkister
6008fbae12 Adds some new vore features.
-Adds a verb for player simplemobs to slowly heal themselves by using nutrition.
-Adds the new dispersed item digestion mode to vorepanel.
-Makes the vorgan autotransfer features available for players and adds the options to vorepanel.

Looks like the vorepanel tgui interface is getting so bloated that some buttons had to be sacrificed in order to add the new ones due to technical limitations.
-Removed the separate toggles for each individual liquidbelly examine level and makes them use the shared toggle instead.
2021-08-18 00:43:52 +03:00
Cadyn
caa7ead78d Pythagorean theorem 2021-08-15 04:07:11 -07:00
Aronai Sieyes
530c13bbbc Merge pull request #11345 from VOREStation/Arokha/removestub
Remove pointless /Crossed stub
2021-08-06 14:51:53 +00:00
Chompstation Bot
21b6022a3a [MIRROR] Adds optional area-based definition for outdoors-ness 2021-08-01 15:41:46 +00:00
Chompstation Bot
d4c6afa5af Remove atom/Uncross override 2021-07-28 20:43:23 +00:00
Aronai Sieyes
fb491666a0 Merge pull request #11226 from VOREStation/Arokha/between
Remove the between() proc
2021-07-24 17:04:21 +00:00
Chompstation Bot
1372d838e1 Port Bay and Eris walls 2021-07-22 20:29:32 +00:00
Nadyr
b48ecdbc98 Merge pull request #2601 from CHOMPStationBot/upstream-merge-11112
[MIRROR] Xenomorph Overhaul and fixes from Gurgstation
2021-07-20 21:04:13 -04:00
Nadyr
a32eef0ea9 powder that makes you say yes 2021-07-20 20:39:23 -04:00
Chompstation Bot
21f58709d7 Fix two suit cycler problems 2021-07-20 03:20:06 +00:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Nadyr
19b0e94af7 Merge pull request #2510 from CHOMPStationBot/upstream-merge-11025
[MIRROR] Fix crafting menu, add plant fiber crafting things
2021-07-13 22:59:04 -04:00