Commit Graph

13929 Commits

Author SHA1 Message Date
Nadyr
eab9750fe2 Merge pull request #4958 from CHOMPStation2/upstream-merge-13752
[MIRROR] Adds spookyghost sanity check
2022-09-18 20:49:42 -04:00
Nadyr
2fd798057b Merge pull request #4939 from CHOMPStation2/upstream-merge-13737
[MIRROR] Some staff-specific pref staff
2022-09-18 20:36:02 -04:00
Nadyr
047c78d659 Merge pull request #4917 from Verkister/patch-92
Earlyports fix for cleanbot runtime spam
2022-09-18 20:24:25 -04:00
Casey
88493f4876 Merge pull request #13752 from Heroman3003/spookyghost-sanity
Adds spookyghost sanity check
2022-09-18 09:39:14 +00:00
Razgriz
bb62f549a2 Actually allow punpun to be spont nommed 2022-09-16 01:08:11 -07:00
Razgriz
6130f4e0fd you're not the punpun I'm looking for 2022-09-16 00:59:50 -07:00
Razgriz
0ba0d124c7 Allow punpun to be spontaneous vored 2022-09-16 00:45:03 -07:00
Razgriz
162f6c5eff Enable spontaneous prey for all mobs 2022-09-16 00:43:30 -07:00
Novacat
22e1a26d4e Merge pull request #13737 from Heroman3003/admin-toggles
Some staff-specific pref staff
2022-09-15 13:52:38 +00:00
Verkister
d872a2802c Earlyports fix for cleanbot runtime spam
Not gonna find an obstacle in a nonexistent path.
2022-09-11 13:31:39 +03:00
Nadyr
04b97a536f Merge pull request #4909 from CHOMPStation2/upstream-merge-13702
[MIRROR] Fixes the VR pods to keep your character sprites perfectly copied.
2022-09-10 22:08:28 -04:00
Nadyr
ed5d69ca87 Merge pull request #4882 from CHOMPStation2/upstream-merge-13692
[MIRROR] Makes Birdsong less memey and more varied
2022-09-10 21:52:41 -04:00
Nadyr
7002c90512 Merge pull request #4887 from TheGreatKitsune/patch-4
Give medihound back modules that they should have
2022-09-10 21:51:46 -04:00
Casey
cb54de58b9 Merge pull request #13702 from tacoguy7765093/VR-Fix-Super-Jank
Fixes the VR pods to keep your character sprites perfectly copied.
2022-09-10 21:06:14 +00:00
Casey
0e33a8669f Merge pull request #13684 from Verkister/patch-122
Fixes scaling offsets for bigdragons/woofs/manders
2022-09-10 20:37:00 +00:00
TheGreatKitsune
4e97f432e0 Give medihound back modules that they should have 2022-09-10 09:56:52 -05:00
Razgriz
0e8d363b0b Rename grit pathname
Renamed Grit pathname because we already have pain_tolerance pathname for halloss damage resistance. It was overwriting Grit.
2022-09-09 16:19:54 -07:00
Novacat
303d6382aa Merge pull request #13692 from Heroman3003/cheepcheep
Makes Birdsong less memey and more varied
2022-09-09 19:57:27 +00:00
Razgriz
d87e02c355 Fix "grit" positive perk
Changed traith path from negative to positive.
I'm sure Virgo will figure this out eventually, so no chomp comment.
2022-09-08 22:33:01 -07:00
Nadyr
85643c0d2c Merge pull request #4865 from CHOMPStation2/upstream-merge-13674
[MIRROR] Adds neutral trait for synthetics to toggle cosmetic pain messages
2022-09-07 18:02:10 -04:00
Nadyr
efb2142de9 Merge pull request #4864 from CHOMPStation2/upstream-merge-13675
[MIRROR] Adds finless shark tail option
2022-09-07 16:34:11 -04:00
Nadyr
7580697dfd Merge pull request #4862 from CHOMPStation2/upstream-merge-13673
[MIRROR] Fixes licking wounds of dead/from dead
2022-09-07 16:23:03 -04:00
Nadyr
f077fde910 Merge pull request #4858 from CHOMPStation2/upstream-merge-13668
[MIRROR] Adds "Grit" Positive trait
2022-09-07 16:18:56 -04:00
Nadyr
553eabccfd Merge pull request #4866 from CHOMPStation2/upstream-merge-13639
[MIRROR] [MIRROR] Fixes oversight with grafadreka reagent processing.
2022-09-07 16:18:46 -04:00
Nadyr
b05676a0c9 powder that makes you say yes 2022-09-07 16:14:31 -04:00
Nadyr
e6c29a0276 powder that makes you say yes 2022-09-07 16:12:05 -04:00
Nadyr
7276d043c7 Merge pull request #4863 from CHOMPStation2/upstream-merge-13671
[MIRROR] More light updates!
2022-09-07 16:10:31 -04:00
Nadyr
a3b80c7370 powder that makes you say yes 2022-09-07 16:09:00 -04:00
Nadyr
52fcd8425b Merge pull request #4860 from CHOMPStation2/upstream-merge-13670
[MIRROR] Fixes playable nurse spider runtime
2022-09-07 16:04:32 -04:00
Nadyr
117138d2d4 powder that makes you say yes 2022-09-07 15:57:25 -04:00
Verkister
f94e3aad59 Fixes _ch leopardmander scaling offset
Fixes wonky vertical offsets when scaling leopardmanders.
Also fixed the other mobs of the same size but those will be flowing from upstream hopefully soon enough.
2022-09-07 20:39:17 +03:00
Casey
1e84f968a5 Merge pull request #13639 from VOREStation/upstream-merge-8701
[MIRROR] Fixes oversight with grafadreka reagent processing.
2022-09-06 20:02:36 +00:00
Casey
2d6841cee0 Adds neutral trait for synthetics to toggle cosmetic pain messages 2022-09-06 20:02:31 +00:00
Casey
0fc8780121 Adds finless shark tail option 2022-09-06 20:02:27 +00:00
Casey
ceca2956e1 Merge pull request #13671 from Cameron653/light_overlay
More light updates!
2022-09-06 19:44:48 +00:00
Casey
55c68a5df3 Fixes licking wounds of dead/from dead 2022-09-06 19:44:43 +00:00
Casey
78df3f0594 Merge pull request #13670 from Heroman3003/nursetime
Fixes playable nurse spider runtime
2022-09-06 19:42:30 +00:00
Casey
33b9d0f678 Adds "Grit" Positive trait 2022-09-06 19:40:17 +00:00
Nadyr
1d132f5aec Merge pull request #4840 from CHOMPStation2/upstream-merge-13651
[MIRROR] Adds traits that reduce nutrition gain
2022-09-04 18:33:00 -04:00
Nadyr
f243472951 Merge pull request #4848 from CHOMPStation2/upstream-merge-13657
[MIRROR] Fixes a runtime with hair cycling
2022-09-04 18:22:33 -04:00
Nadyr
780fade93a powder that makes you say yes 2022-09-04 18:08:28 -04:00
Casey
1b244ca48d Merge pull request #13657 from Heroman3003/hairruntime
Fixes a runtime with hair cycling
2022-09-04 21:55:48 +00:00
Casey
cbdb959053 Adds traits that reduce nutrition gain 2022-09-04 21:48:01 +00:00
Casey
cfe8e710d2 Fixes a bunch runtimes 2022-09-04 21:47:57 +00:00
Nadyr
85b9e3c8e7 Merge pull request #4831 from CHOMPStation2/upstream-merge-13638
[MIRROR] Fixes runtime with chirping birds
2022-09-04 17:03:20 -04:00
Nadyr
fcce1ae29f Merge pull request #4822 from CHOMPStation2/upstream-merge-13626
[MIRROR] Fixes runtime with simplemob headsets
2022-09-04 16:43:14 -04:00
Nadyr
5924b77fc0 powder that makes you say yes 2022-09-04 15:55:16 -04:00
Casey
9f0965e166 Merge pull request #13638 from Heroman3003/language-runtime-fix
Fixes runtime with chirping birds
2022-09-03 16:50:54 +00:00
Casey
56f2d8dcc0 Merge pull request #13625 from Verkister/patch-119
Fixes wonky scaling on empty voremob icon updates
2022-09-02 05:14:19 +00:00
Casey
a4657e6347 Fixes runtime with simplemob headsets 2022-09-02 05:14:15 +00:00