Commit Graph

1420 Commits

Author SHA1 Message Date
SpookyTheFox
03baa98f7b Update flora.dm 2022-12-24 19:13:06 -05:00
SpookyTheFox
ec688c5f52 documentation? 2022-12-24 19:08:12 -05:00
BongaTheProto
2e5d79c8f6 Merge pull request #650 from Chlorotrifluoride/master
Made hop parade uniform and suit functional with digi-legs
2022-12-24 18:32:02 -05:00
Darius
20df2e6eeb Prevent holodeck griefing
Replaces plasma flood, holo-carp, and killer bees. The modules will now create harmless air, corgis, and foxes.
2022-12-24 18:17:14 -05:00
SpookyTheFox
6d93d8019c inline version 2022-12-24 14:45:43 -05:00
SpookyTheFox
17fc62ad1a modularized
and removed the /anything portion
2022-12-24 14:15:27 -05:00
Chlorotrifluoride
ca08b99a5a Update jobs.dm 2022-12-24 11:15:44 -05:00
Chlorotrifluoride
0a00335daf Update civilian.dm 2022-12-24 11:12:55 -05:00
Jerry Wester
8ea83c2ba0 we're the tunnel foxes! that's us. and we rule! 2022-12-24 00:47:59 -07:00
LunarFleet
ac4bbf2a5a Balancing Changes 2022-12-22 19:20:10 -05:00
BongaTheProto
4ea99737aa Merge pull request #643 from LeDrascol/modular-cursed-blood
Modularize cursed blood effects
2022-12-21 21:19:00 -05:00
Darius
ad97253107 Unrestricted light replacer
Changes the departmental flag for light replacers from service and engineering to all.
2022-12-21 14:51:08 -05:00
LunarFleet
2015d0a1a8 THE ONE LINE IS REAL (CAN WE GET MUCH HIGHER, SO HIGH) 2022-12-21 00:05:44 -05:00
LunarFleet
a52d5f2cbc Mmm, Statue 2022-12-21 00:02:17 -05:00
BongaTheProto
be8a0cfbb4 Merge pull request #638 from LunarFleet/Poyo
Additional Barks
2022-12-20 19:42:20 -05:00
JimmyDrop
80729c8553 Initial Clothing Pass
Initial pass of edible Clothing. Should cover most cases with some outliers still existing.  In general most important things are protected, such as hard suits, armor, helmets, gasmask, CRBN equipment, and glasses.

Ill give this another pass later to get most of outliers. But for now this should be fine.
2022-12-20 14:51:48 -05:00
LunarFleet
580ae3eaa4 Merge branch 'master' into gargoyle 2022-12-20 03:45:15 -05:00
LunarFleet
923a4a0364 Fix conflicts, maybe? 2022-12-20 03:43:01 -05:00
LunarFleet
0211058d34 Finally, statue 2022-12-20 03:33:46 -05:00
LunarFleet
5fb8233da3 Pausing for now 2022-12-19 03:42:13 -05:00
Darius
39ff3eeb2f Refactor cursed blood effect into modular
Moves TRAIT_CURSED_BLOOD effects into modular code. Makes change to holy water and blood drunk miner.
2022-12-18 18:26:38 -05:00
BongaTheProto
239f038d74 neck fire
it works with the update now
2022-12-16 21:50:54 -05:00
BongaTheProto
f4dff2a973 Merge pull request #597 from JerryWester/increased_hunger
Homgry
2022-12-16 20:33:04 -05:00
JimmyDrop
06b84b7d5c Temporary Disabling Toughness check.
Replacing it with a better system. But for now so moths aren't struggling to eat underwear. Its gonna be disabled.
2022-12-16 13:38:25 -05:00
BongaTheProto
0577e8c9e1 Merge pull request #635 from LeDrascol/sell-invisiboots
Add Invisiber Footwraps to Kinkmate vendor
2022-12-16 12:35:03 -05:00
LunarFleet
d734505d9d Poyo Update, at long last 2022-12-16 00:13:01 -05:00
Darius
66f7822ff7 Fix minor issues with fate dice tweak
- Switches from /diceroll to /effect to prevent wizard-related runtime errors and allow dice to roll properly
- Message type changed to match other messages
- Message text adjusted to better imply new behavior
2022-12-15 13:38:23 -05:00
Darius
a4d8f17f2f New scientist title: Rack Researcher
Adds the title of "Rack Researcher" to the scientist.
2022-12-15 12:11:35 -05:00
Darius
454a89cb94 Make single-use Dice of Fate track per-person
Allows the dice to be rolled once per user, instead of once ever. This encourages sharing the item.
2022-12-15 12:10:27 -05:00
Darius
e8441756c0 Add Invisiber Footwraps to Kinkmate vendor
Invisible shoes are currently only obtainable by loadout. Forgetting to select them, or losing them during the round, would them unobtainable before this change.
2022-12-15 08:02:34 -05:00
LunarFleet
79629e6cac Bark Set One 2022-12-15 01:44:15 -05:00
BongaTheProto
90ed737eb7 Merge pull request #627 from LeDrascol/empath-heatpat-sense
Allow empath to detect Distant and Headpat Slut
2022-12-13 13:43:48 -05:00
BongaTheProto
d6d9fd5091 Merge pull request #631 from LeDrascol/emote-facepaw
Adds face-metacarpus emotes
2022-12-13 13:38:32 -05:00
BongaTheProto
655b0c943e Merge pull request #632 from SPLURT-Station/Christ-mas
Add Christmas event clothing to Clothesmate
2022-12-13 13:28:23 -05:00
BongaTheProto
240c3115b0 Merge pull request #629 from JerryWester/garter_loadout
Add garters to the loadout
2022-12-13 13:22:06 -05:00
BongaTheProto
b0122c6d9b Update clothesmate.dm
i guess they forgor
2022-12-13 13:13:08 -05:00
Darius
1ba855f9db Adds face-metacarpus emotes
Adds facepalm, facepaw, faceclaw, and facehoof. Displays a random message from three possibilities.
2022-12-13 06:47:45 -05:00
ShamanSliph
2a4c0e9803 Merge branch 'master' into cloth-eater 2022-12-10 23:57:35 -05:00
JimmyDrop
3d428c6455 Everything but Attack() updated.
INB4 I missed something.
2022-12-10 23:47:59 -05:00
Darius
ecdbe5ade6 Fix a silly typo with empath headpats
Prevents Headpat Slut from reviving physical affection. The physical affection will remain eradicated.
2022-12-10 23:21:46 -05:00
Jerry Wester
08cf6664c6 Add garters to the loadout 2022-12-10 16:32:53 -07:00
Le Commandor
627c7db3fc Merge branch 'SPLURT-Station:master' into master 2022-12-10 22:28:34 +04:00
Le Commandor
544eb5db25 sugg3619 2022-12-10 22:24:44 +04:00
BongaTheProto
8c02f7cc80 Merge branch 'master' into pr/610 2022-12-10 11:59:51 -05:00
Darius
29c10aadd0 Add the funny BYOND dots to empath quirk detection
Adds ". = ..()" to the function
2022-12-10 11:17:43 -05:00
Darius
f4d56f886a Move peacekeeper alt titles to main file
- Moves the new peacekeeper titles to the original job file.
- Splits peacekeeper job titles onto multiple lines for easier editing and consistency with job_alt_titles
2022-12-10 11:09:47 -05:00
Darius
99289a5ff5 Minor headpat quirk detection changes
- Adds a newline to the two messages to prevent line issues.
- Moves the pronoun variables after the escape clause
- Simplifies can-pat text
- Disables unused pronouns
2022-12-10 10:20:59 -05:00
Darius
516d13bedd Allow empath and friendly to sense headpat traits
Empath and Friendly quirks add an inspect text to targets that identifies if they have Headpat Slut or Distant quirks.
2022-12-10 08:17:14 -05:00
Darius
5d4b741127 Add new peacekeeper titles
Adds the titles "Hired Muscle" and "Bodyguard" to peacekeeper
2022-12-10 05:07:58 -05:00
BongaTheProto
09518b09a4 Merge pull request #621 from LeDrascol/nerf-masked-mook
Nerf Bane Syndrome quirk
2022-12-09 17:24:27 -05:00