Commit Graph

53354 Commits

Author SHA1 Message Date
BongaTheProto
e3d35f46aa Merge pull request #713 from Kush1Push1/splurt_pilot
Pilot and pilot jaw body markings
2023-01-26 16:45:35 -05:00
Changelogs
288843bf20 Automatic changelog compile [ci skip] 2023-01-26 06:42:22 +00:00
SPLURT Bot
e52ae7da33 Automatic changelog generation for PR #600 [ci skip] 2023-01-26 06:40:51 +00:00
BongaTheProto
2aa678176e Merge pull request #600 from ShamanSliph/cloth-eater
New Quirk: Clothes Eater and Fixes Insects chewing clothes
2023-01-26 01:39:16 -05:00
BongaTheProto
4bba867c36 Merge pull request #712 from Kush1Push1/splurt_beak
Corvid beak
2023-01-25 22:47:11 -05:00
Changelogs
a8a4dccc8f Automatic changelog compile [ci skip] 2023-01-25 23:19:29 +00:00
SPLURT Bot
6bf98d0e3f Automatic changelog generation for PR #703 [ci skip] 2023-01-25 23:18:04 +00:00
BongaTheProto
4b502c8e17 Merge pull request #703 from LeDrascol/techweb-move-rack
Move Research Rack to Biological Technology
2023-01-25 18:16:43 -05:00
Changelogs
e61df6ab2c Automatic changelog compile [ci skip] 2023-01-25 23:05:42 +00:00
SPLURT Bot
31a59205eb Automatic changelog generation for PR #716 [ci skip] 2023-01-25 23:04:14 +00:00
BongaTheProto
2bb3832f37 Merge pull request #716 from LeDrascol/remove-dnc
Remove redundant use of quirk DNC
2023-01-25 18:02:51 -05:00
BongaTheProto
fcc10eb9cc Merge remote-tracking branch 'upstream/master' 2023-01-25 18:02:17 -05:00
Sandstorm Bot
779eae1e27 Automatic changelog compile [ci skip] 2023-01-25 21:50:04 +00:00
Sandstorm Bot
4a493640b2 Automatic changelog generation for PR #293 [ci skip] 2023-01-25 21:48:59 +00:00
Darius
893a63cd11 [PORT] New quirk: DNC Order (#293)
* Port DNC quirt

Ports the do-not-clone quirk from SPLURT. This change is not modular.

- Added a fix for cloning heads and brains
- Removed flavor text implications that the order was voluntary
- Quirk renamed from `DNC` to `DNC Order`
- Trait renamed from `TRAIT_NO_CLONE` to `TRAIT_DNC_ORDER`

* Modularize cloning machine DNC check

Moves the code for DNC Order quirk check in the cloning machine into modular space, and removes it from base code.
2023-01-25 18:47:49 -03:00
BongaTheProto
14a5df0c8a Merge branch 'Sandstorm-Station:master' into master 2023-01-25 16:42:25 -05:00
Kush1Push1
f76d765d55 A fix 2023-01-25 22:06:54 +07:00
SandPoot
a21f3f75a2 NOT TABLE, STRUCTURE, also living_peeker 2023-01-24 22:10:31 -03:00
SandPoot
d2e08f17ea let's check for structure.climbable instead! 2023-01-24 22:07:15 -03:00
Changelogs
d729676413 Automatic changelog compile [ci skip] 2023-01-24 18:13:39 +00:00
SPLURT Bot
f5d451e597 Automatic changelog generation for PR #681 [ci skip] 2023-01-24 18:12:13 +00:00
BongaTheProto
5c1351d519 Merge pull request #681 from LeDrascol/quirk-bloodfledge-overhaul
Bloodsucker Fledgling quirk overhaul
2023-01-24 13:10:44 -05:00
Kush1Push1
e42c2f1a1d Initial 2023-01-24 22:13:30 +07:00
Kush1Push1
fa2047291d initial 2023-01-24 22:08:42 +07:00
BongaTheProto
9a67937ff7 Merge branch 'Sandstorm-Station:master' into master 2023-01-23 23:08:25 -05:00
SandPoot
da5c66c5b8 bits 2023-01-23 21:20:10 -03:00
SandPoot
122bc02af9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-23 20:58:51 -03:00
Changelogs
8551bab7fd Automatic changelog compile [ci skip] 2023-01-23 22:39:59 +00:00
SPLURT Bot
d2f78a1d5a Automatic changelog generation for PR #711 [ci skip] 2023-01-23 22:38:32 +00:00
BongaTheProto
9d1aaabc97 Merge pull request #711 from LunarFleet/let-them-bake-cake
Allow service borgs to cook
2023-01-23 17:37:09 -05:00
Darius
589ecf7db9 Add Cursed Blood integration to Bloodfledge bite
Adds an integration between Bloodsucker Fledgling that gives a positive or negative mood to the quirk holder when biting a target with cursed blood, depending on if the quirk holder also has cursed blood.
2023-01-23 17:34:37 -05:00
BongaTheProto
7fd55c6574 Merge branch 'Sandstorm-Station:master' into master 2023-01-23 17:31:37 -05:00
LunarFleet
5dd2d46f96 Yes M'lord 2023-01-23 17:25:07 -05:00
silicons
2d5e163916 Merge pull request #15947 from SandPoot/bitfield-updates
Updates bitfields, admin side
2023-01-23 13:02:28 -08:00
LunarFleet
0bf3a67cee Bake maxxing 2023-01-23 03:54:38 -05:00
LunarFleet
356dd7a8cd Agony 2023-01-22 21:35:52 -05:00
SandPoot
0c87f5e0f0 different checking method 2023-01-22 23:32:29 -03:00
Changelogs
a5250f4472 Automatic changelog compile [ci skip] 2023-01-22 22:34:00 +00:00
SPLURT Bot
c657a6baa7 Automatic changelog generation for PR #710 [ci skip] 2023-01-22 22:32:32 +00:00
BongaTheProto
d675dbbae5 Merge pull request #710 from LeDrascol/fix-mood-newline
Fix mood event newlines
2023-01-22 17:31:09 -05:00
Darius
67b39914bb Fix mood event newlines
Restores missing newline markers to modular mood events. These were lost during a replacement of HTML spans. Also adds the missing span to mood event `cum_craving`.
2023-01-22 14:43:52 -05:00
Changelogs
6eac1b3b24 Automatic changelog compile [ci skip] 2023-01-22 17:34:42 +00:00
SPLURT Bot
58d062c45d Automatic changelog generation for PR #708 [ci skip] 2023-01-22 17:32:55 +00:00
BongaTheProto
b00ac4b59e Merge pull request #708 from WoolyAypa/Holy-Clothing-Stuff
[BOUNTY] Null Rod and Armory Beacon styles
2023-01-22 12:31:30 -05:00
SandPoot
854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
Darius
d7997fbdf9 Remove quirk DNC
Removes the DNC quirk, as the upstream merge makes it redundant.
2023-01-22 11:44:54 -05:00
BongaTheProto
3ae8edf803 Merge remote-tracking branch 'upstream/master' 2023-01-22 01:06:28 -05:00
Sandstorm Bot
acc07526c4 Automatic changelog compile [ci skip] 2023-01-21 23:44:59 +00:00
Sandstorm Bot
9572a67a44 Automatic changelog generation for PR #291 [ci skip] 2023-01-21 23:44:02 +00:00
Darius
3c4f222e40 Disable thirst for robotic species (#291)
Adds TRAIT_NOTHIRST to synthetic lizardperson, synthetic anthropomorph, and IPC.
2023-01-21 20:43:11 -03:00