Commit Graph

858 Commits

Author SHA1 Message Date
BlackMajor
362f539e12 Chrimbus Tree 2022-12-23 20:40:37 +13:00
Nadyr
7880cfecaa Merge pull request #5420 from Raeschen/Raeschen-patch-1
Fix bad teshari captain cloak
2022-12-21 19:48:04 -05:00
Raeschen
e51f171cdf actually edit the modular file
wow i'm bad at webedits
2022-12-21 01:18:27 +01:00
Raeschen
6148e71eaf loadout_xeno in modular for patch 2022-12-21 01:14:13 +01:00
Nadyr
7d29b8940f Merge pull request #5405 from Seris02/sectdroneloaf
sect drone l o a f + sect drone icon improvements (in my opinion)
2022-12-19 19:06:42 -05:00
BlackMajor
f602eb20b4 Merge branch 'master' into protean-rework 2022-12-19 18:27:08 +13:00
Nadyr
9691157048 Merge branch 'master' into DesertTiles 2022-12-17 23:12:09 -05:00
Heretical Lizard
0113a34738 adds the relevant things (#5402) 2022-12-17 16:59:53 -07:00
Raeschen
98a9921c4f Various Fixes (#5399)
* modularize digitigrade code

* Hide glasses + tail side layering fix

* pipe unwrench yeet

Co-authored-by: Razgriz <razgriz1032@gmail.com>
2022-12-17 16:59:20 -07:00
Desert
602ddec4e7 Updates Gender Chems (#5355)
* Updates Gender Chems

Removes Elixir formulas but keeps their effects, moving them under the Amorphorovir family of chemicals. Also imposes a double preference check now. Spontaneous TF needs to be enabled and you have to accept the alert letting you know what will happen.

* Fixed some comments.

* Moved stuff to chomp modular folder
2022-12-17 16:58:59 -07:00
Seris02
75ed10aeac *bruh* it's not an upstream file how high was I 2022-12-17 21:47:15 +08:00
Seris02
f6c3fbcb5f woops forgot to delete screenshot helper code 2022-12-17 21:35:36 +08:00
Seris02
8e573430ac sect drone l o a f + sect drone icon improvements 2022-12-17 21:31:37 +08:00
Darlantan
559ab34e31 Fixes shrub, randomizes rocks, maybe fixes turf edges on mapload 2022-12-16 02:52:12 -05:00
TheGreatKitsune
2a446b926f Add verb to toggle species speech sounds 2022-12-13 13:12:05 -06:00
Razgriz
ec363507dc Merge pull request #5375 from TheGreatKitsune/Reforming
Reforming
2022-12-11 19:36:32 -07:00
Razgriz
80bd41a0eb Merge pull request #5352 from Verkister/floppin
A tiny sprinkle of new sprite accessories
2022-12-11 19:27:11 -07:00
TheGreatKitsune
c4ca4bbaed Merge master into reforming. 2022-12-10 14:53:38 -06:00
TheGreatKitsune
926f7d1e63 Fix remaining reforming bugs 2022-12-10 14:49:30 -06:00
Kassc
cdf0be2cae Merge pull request #5356 from UniquaSa/restoration
RestaurationBar SuperPose Capsule
2022-12-08 14:10:13 -05:00
Darlantan
1444bd5026 finishes icon cleanup, adds more props, adds flora, adds some prop mechanics 2022-12-06 23:24:41 -05:00
Verkister
3706180db4 A tiny sprinkle of new sprite accessories
-Adds 3 new markings (forward fangs, further forward fangs, normal eyes)
-Adds 2 new earstyles (floppy goat ears, floppy goat ears with horns)
2022-12-05 17:42:50 +02:00
Darlantan
73e3a1d16f Turfs, props, flora, and cleanup
-Moves/rearranges a lot of the code/files on this branch, not done yet
-Requested turfs + special behavior
-Tweak to edge generation so we can use our files too
-Plants
-Props
2022-12-05 08:41:14 -05:00
Heroman3003
3944ca017a Merge pull request #14158 from Heroman3003/language-lore
Makes languages properly preview on species preview window
2022-12-04 19:41:39 +00:00
SarmentiCampbell
04364bb5d4 Merge branch 'master' into restoration 2022-12-04 11:54:42 +01:00
Nadyr
44a2103d50 Merge pull request #5315 from TheGreatKitsune/borg-scene-gripper
Add a scene gripper to borgs
2022-12-02 19:07:49 -05:00
Nadyr
6e38171899 Merge pull request #5314 from CHOMPStation2/New-Mob-Sounds
New mob variants and cyber horror AI tweaks and sounds
2022-12-02 19:07:07 -05:00
SarmentiCampbell
51d3d2d5f4 done 2022-12-02 17:51:58 +01:00
Razgriz
343c2757c3 Merge pull request #5316 from Darlantanis/NoncrewTweaks1
Minor non-crew tweaks 1
2022-11-25 19:08:58 -07:00
Darlantan
91fc31c6b4 Renames "non-crew" to "outsider," provides external ID
-Renames "non-crew" to "outsider."
-Provides an external ID to outsiders, allowing PDA use.
-Improves grammar in outsider job description
-Reformats outsider to use a define for the job name, replaces hard-coded uses of "non-crew" with said define.
2022-11-25 19:56:59 -05:00
TheGreatKitsune
743134173f Add a scene gripper to borgs 2022-11-25 11:05:06 -06:00
Razgriz
10a9efd4eb Infector (infection bot) update and sound 2022-11-25 04:03:19 -07:00
Razgriz
333a5b1128 Merge pull request #5308 from Raeschen/gentlephase
Shadekin gentle-phase, colorable teshplush, more traits for noncustom
2022-11-25 03:57:34 -07:00
Razgriz
adad1245a1 New mob variants and cyber horror AI tweaks and sounds
New assets for upcoming Kara project. A few new additions to modular_chomp
-New gygax variant for Kara with sounds and text
-New drone variant for Kara with sounds and text
-Cyber horror mobs now have sounds
-Regular horror mob variant adds AI behavior and sounds.
-New weapon sounds under modular_chomp
2022-11-24 23:38:20 -07:00
Raeschen
aa4c2fd56c Cleanup an instanced obj with eyefix PR 2022-11-24 18:12:54 +01:00
Razgriz
5761b00c17 Merge pull request #5292 from CHOMPStation2/mobdropprey
Disable can be drop prey on a bunch of mobs
2022-11-23 22:40:48 -07:00
Nadyr
3bdae72a37 Merge pull request #5312 from TheGreatKitsune/carbonkin-job-bans
Fix a pair of carbonkin job bugs
2022-11-23 18:41:39 -05:00
TheGreatKitsune
20d5657b78 Fix a pair of carbonkin job bugs 2022-11-23 16:56:24 -06:00
TheGreatKitsune
2f9d0b7e32 New vore sprite options 2022-11-23 12:27:51 -06:00
Raeschen
c81d482edb Shadekin gentle-phase, colorable teshplush, more traits for noncustom
> Shadekin can now 'gentle-phase'. No light destruction, less flickering but a stun after phasing in. Toggle between normal-mode and gentle-mode with a verb in the abilities tab
> Colorable teshplush in loadout - general
> Some traits added for noncustoms; Hard feet, deep sleeper, master linguist.
2022-11-23 13:46:25 +01:00
Raeschen
1ff5a9486c Fix eyes on custom/xenochimera not respecting the icon base selection
Now you can be custom/xenochimera of other species without fucking up the eyes!
2022-11-22 17:52:50 +01:00
Nadyr
1b0798a739 powder that makes you say yes 2022-11-21 23:07:15 -05:00
Nadyr
0d8eec09d6 powder that makes you say yes 2022-11-21 23:06:43 -05:00
Nadyr
687a3583a2 powder that makes you say yes 2022-11-21 23:06:27 -05:00
Razgriz
8a8faee9b3 Disable can be drop prey on a bunch of mobs
Leaves some very passive and the pets good still.
2022-11-20 22:48:38 -07:00
Razgriz
da2d9d7d8a Merge branch 'master' into protean-rework 2022-11-14 23:50:50 -07:00
Raeschen
b34b2ce48f Fix broken tesh mechanics + nerf underwater diving 2022-11-13 17:46:19 +01:00
Razgriz
1dbe1351fc Merge pull request #5241 from TheGreatKitsune/sect-drone-taur
Add sect drone taur tails
2022-11-10 13:03:10 -07:00
Verkister
36b0fb1d9f Adds a verb to toggle headset icon visibility.
Adds a verb to IC tab that lets you hide/show headset sprite on your char. (Hella eyesore on large chars looking like someone stapled a whole-ass parking ticket on their cheek lmao)
Also fixes an indentation crime while at it.
2022-11-10 15:24:47 +02:00
Verkister
d8a93c99ab A small bundle of sprite accessory things
-Adds markings for thick neck (2 sizes and extra for throat coloring)
-Adds colorable versions of the troll horns that were never useful for anything else due to forced color.
-Fixes elf ears missing sprites (todo: upstream pr if i can be arsed to)
-Improves humanoid round gut marking shading contrast. (I was legit surprised that it even had any in the first place. always thought it was just flat while lmao)
2022-11-09 15:35:32 +02:00