Razgriz
ec57252f19
Merge pull request #5703 from CHOMPStation2/upstream-merge-14477
...
[MIRROR] fix default proteans being technically organic shift start
2023-02-12 19:01:04 -07:00
Razgriz
12b6e318d0
Merge pull request #5701 from CHOMPStation2/upstream-merge-14475
...
[MIRROR] Makes muffins not have beans in them
2023-02-12 19:00:44 -07:00
Razgriz
b3b5924429
Merge pull request #5698 from CHOMPStation2/upstream-merge-14474
...
[MIRROR] Removes R_STEALTH perm requirement for staff chats
2023-02-12 18:59:53 -07:00
Razgriz
6b79bc97a7
Merge pull request #5697 from CHOMPStation2/upstream-merge-14470
...
[MIRROR] Cloaks, undies, the Antediluvian, and some other bits
2023-02-12 18:59:42 -07:00
Razgriz
ed0add7392
Merge pull request #5693 from CHOMPStation2/upstream-merge-14467
...
[MIRROR] Succlet adjust
2023-02-12 18:59:36 -07:00
Razgriz
411942db8e
Merge pull request #5574 from Cyrelius/items
...
Making clothing protect against water like it should.
2023-02-12 18:54:42 -07:00
Razgriz
96bd2131c3
powder that makes you say yes
2023-02-12 18:26:25 -07:00
Razgriz
7754f37bd5
powder that makes you say yes
2023-02-12 18:23:57 -07:00
Razgriz
4c83ecfc72
Merge pull request #5694 from CHOMPStation2/upstream-merge-14469
...
[MIRROR] All the tesh winter coats
2023-02-12 18:23:08 -07:00
Razgriz
6d51b51abb
Merge pull request #5695 from Sharkmare/patch-1
...
Reroute Teshwraps to just use Footwraps
2023-02-12 18:22:31 -07:00
Razgriz
dff3429995
Merge pull request #5696 from purplefoxy27/digest-process-fix
...
Process digest triggers death hooks now - Fixes #5540
2023-02-12 18:22:09 -07:00
Razgriz
c565d187fb
Merge branch 'master' into upstream-merge-14467
2023-02-12 18:20:10 -07:00
Razgriz
b096962e25
Merge pull request #5690 from Rykka-Stormheart/shep-dev-extreme-mouth
...
Renames Big/Giant Mouth to Fast Eater, adds extreme version
2023-02-12 18:17:00 -07:00
Razgriz
4a52255262
Merge pull request #5689 from Rykka-Stormheart/shep-dev-temp-message-custom-fix
...
Fixes Custom Cold messages being uneditable/editing the wrong list
2023-02-12 18:16:05 -07:00
Razgriz
0b1059963b
comments that make you say yes
2023-02-12 17:59:01 -07:00
Razgriz
71cc3901a1
Merge pull request #5684 from Echopsychotic/Clothing
...
witch hat and cyborg mask added
2023-02-12 17:55:42 -07:00
Casey
c34feccac3
Merge pull request #14477 from Seris02/proteandefaultfix
...
fix default proteans being technically organic shift start
2023-02-12 18:21:32 +00:00
Casey
1d8f544245
Merge pull request #14475 from Heroman3003/b-e-a-n
...
Makes muffins not have beans in them
2023-02-12 18:20:21 +00:00
Cyrelius
152582a17e
Update phase.dm
...
Reverting changes on this branch, as it shouldn't have them.
2023-02-11 21:16:16 -08:00
Novacat
5d0e80d46c
Removes R_STEALTH perm requirement for staff chats
2023-02-11 21:47:03 +00:00
Heroman3003
358e8e9fa2
Cloaks, undies, the Antediluvian, and some other bits
2023-02-11 19:10:39 +00:00
Cyrelius
bd86c90c5d
Create rig.dm
...
Undoes what I was doing here, moving it to modular chomp.
2023-02-11 00:35:12 -08:00
Cyrelius
a99919c5d8
Update rig.dm
...
Zeroed permeability coeficient
2023-02-11 00:08:04 -08:00
purplefoxy27
2ac96d157d
Process digest triggers death hooks now - Fixes #5540
2023-02-10 21:38:33 -08:00
Sharkmare
34dfd9b6f5
Reroute Teshwraps to just use Footwraps
...
This mainly only matters for shapeshifters who thought tesh have to use this.
Yes, this is a self-callout.
2023-02-11 06:37:28 +01:00
Heroman3003
0a07539d01
Merge pull request #14469 from Seris02/teshbranch
...
All the tesh winter coats
2023-02-10 09:16:05 +00:00
Cyrelius
4a69a6ae95
Update telecube.dm
...
Minor fix to the techs given by Locii.
2023-02-09 23:39:11 -08:00
Fire Hazard
f0b0736bbd
missing text
2023-02-09 07:42:18 -06:00
Novacat
74d23471f5
Succlet adjust
2023-02-09 13:22:31 +00:00
Rykka Stormheart
9325034936
Fixes datum names
2023-02-09 00:42:11 -08:00
Cyrelius
204a328868
Merge branch 'CHOMPStation2:master' into items
2023-02-08 22:50:13 -08:00
Rykka Stormheart
f8c42c025e
Renames Big/Giant Mouth to Fast Eater, adds extreme version
...
Adds a version to instantly eat anything in one bite. Shouldn't be horribly unbalanced, considering giant exists.
Giant Mouth becomes Fast Eater
Big Mouth becomes Fast Eater, Minor
Fast Eater, Major, added, instantly eats anything of any size.
This makes the list view more similarly to Brute Resist/Major/Minor, etc.
2023-02-08 08:10:26 -08:00
Rykka Stormheart
cc135c3d33
Fixes Custom Cold messages being uneditable/editing the wrong list
...
As described. Prior to this, clicking this would bring up the custom_heat list, and fail to set messages correctly.
This corrects that.
2023-02-08 08:01:31 -08:00
Nadyr
f81a4f1bd1
Merge pull request #5687 from CHOMPStation2/upstream-merge-14446
...
[MIRROR] skyrat outfit port continuation (adds to loadout)
2023-02-08 00:39:57 -05:00
Heroman3003
c7827b37fb
Merge pull request #14446 from Hatterhat/outfit-pass2
...
skyrat outfit port continuation (adds to loadout)
2023-02-08 03:13:42 +00:00
Heroman3003
9cb7422998
Merge pull request #14465 from ItsSelis/master
...
Admin href fax topic thing fix
2023-02-08 03:13:36 +00:00
Fire Hazard
866a6692c5
mask and hat
...
Adds cyborg mask and witch hat to loadout
2023-02-07 16:59:58 -06:00
Nadyr
fe03ff3109
Merge pull request #5660 from CHOMPStation2/upstream-merge-14439
...
[MIRROR] Some post-mirror fixes
2023-02-07 17:48:27 -05:00
Nadyr
06c278ca1e
Merge pull request #5679 from CHOMPStation2/upstream-merge-14459
...
[MIRROR] proper sanitization of cold and heat messages
2023-02-07 17:35:29 -05:00
Nadyr
0f083401d0
Merge pull request #5666 from CHOMPStation2/upstream-merge-14410
...
[MIRROR] Fixes #14173 , other modular computer file manager improvements
2023-02-07 17:34:57 -05:00
Nadyr
b5eac2e9a1
powder that makes you say yes
2023-02-07 17:32:02 -05:00
Nadyr
c42b672dce
powder that makes you say yes
2023-02-07 17:03:37 -05:00
Nadyr
a9b92fee76
powder that makes you say yes
2023-02-07 17:02:29 -05:00
Heroman3003
d3bad85beb
Some post-mirror fixes
2023-02-07 16:55:49 -05:00
Nadyr
ccc3101516
powder that makes you say yes
2023-02-07 16:45:46 -05:00
Nadyr
e2ff2b55c2
Merge pull request #5658 from CHOMPStation2/upstream-merge-14430
...
[MIRROR] [MIRROR] Removes unused mecha damage absorbtion list.
2023-02-07 16:40:22 -05:00
Nadyr
90f3767a1e
Merge pull request #5655 from CHOMPStation2/upstream-merge-14431
...
[MIRROR] [MIRROR] fixes robo limbs setting child limbs afterwards
2023-02-07 16:39:51 -05:00
Casey
ac099a732b
proper sanitization of cold and heat messages
2023-02-07 19:19:18 +00:00
Nadyr
7755d3a593
Merge pull request #5678 from Rykka-Stormheart/shep-dev-discomfort-earlyport
...
Earlyports #14459 from VORE, properly sanitizes heat/cold messages
2023-02-07 13:43:58 -05:00
Nadyr
33c887c041
Merge pull request #5677 from CHOMPStation2/upstream-merge-14458
...
[MIRROR] Succlet
2023-02-07 13:43:12 -05:00
