Commit Graph

31688 Commits

Author SHA1 Message Date
SatinIsle
74748cfdf3 Adds raptor vore mobs
Added raptor vore mobs. They're retaliate mobs with a digestion focus. They have weight gain sprites and get a little chunkier after at least partially digesting someone (or otherwise gaining nutrition).

Added the raptors and bats to the maint pred list.

Added the raptors, bats, vampires and succubi to the semirandom vore mob list.
2023-09-26 00:37:07 +01:00
Heroman3003
4e5f8182a9 Merge pull request #15418 from TankTheBirb/nif-me-borgi-uvu
Removes unecessary tooling and re-adds necessary tooling to research borgs
2023-09-25 06:15:48 +10:00
Heroman3003
67bea3343d Merge pull request #15420 from SatinIsle/fantasy
Updates to fantasy redgate
2023-09-25 04:43:33 +10:00
SatinIsle
7c5f21c166 Updates to fantasy redgate
Added a room with a bigger vampire and good fantasy loot behind a locked door that can only be opened with a newly hidden key. Alongside a few turfs, mob and spawner to support this.

Fixed https://github.com/VOREStation/VOREStation/issues/15416 by adding sprites to open dungeon walls, other sprite fix was in a previous PR.

Added a note at the entrance of the redgate asking people to not bring weapons home.
2023-09-24 13:12:31 +01:00
Heroman3003
9b99472416 Merge pull request #15419 from KillianKirilenko/kk-mini2
Armour Examine Tweaks
2023-09-24 17:19:26 +10:00
Killian
26cd076860 Update armor.dm 2023-09-24 08:09:24 +01:00
Killian
0f21acc4aa Update armor.dm 2023-09-24 07:53:11 +01:00
Heroman3003
6e5c9c561d Merge pull request #15406 from Heroman3003/test-vore-setup
Attempts implementation of char setup vore panel
2023-09-24 15:54:33 +10:00
TankTheBirb
75f7891a79 Removes unecessary tooling and re-adds necessary tooling to research borgs
Removes the Surgical Scalpel and Circular Saw. Adds the Hemostat and Surgical Drill.

Why? Because the research borg should not be surgically removing brains and they don't even have all they need to do it. But what they should be doing is synth repairs and NIF installs. And that requires just two surgical tools.

Also they can't start surgeries without a scalpel so organics are safe from malpractice.
2023-09-23 21:38:23 -04:00
Killian
e064c0e13b soup's on! 2023-09-24 00:12:02 +01:00
Heroman3003
ef6a314c32 Merge pull request #15413 from SatinIsle/edible_mobs
Edible retaliate mobs
2023-09-24 06:47:16 +10:00
SatinIsle
c1ab2a008f Fixes bats too and buffs the health of vampires 2023-09-23 18:41:17 +01:00
SatinIsle
312b3250ac Fix for specific wolftaur and vampire icon states
Wolftaur and vampire mobs that were specifically chosen and not randomly picked did not have sprites chosen for living, rest and dead variables. This has been fixed.
2023-09-23 13:37:04 +01:00
SatinIsle
62bc133ca4 Edible retaliate mobs
Makes some mobs that are retaliate or vore hostile stop fighting whilst inside a belly. Specifically: Squirrels, bats, peasants, sheep, succubi, vampires, wolfgirls and wolftaurs.

Also adds this to passive mobs, which won't change anything normally as they don't fight when eaten. However, it will mean that catgirls and lamia, which are normally passive, will stop fighting in a belly if spawned via the semirandom mob spawner.
2023-09-23 12:40:16 +01:00
SatinIsle
d8ef4a89be Moved size wand to combined file 2023-09-23 01:32:46 +01:00
SatinIsle
a5327c1a59 Added wooden shelves and racks 2023-09-23 01:17:23 +01:00
SatinIsle
d8ba52dd10 Adds teleportation tome and makes potion bases smaller 2023-09-23 00:28:31 +01:00
SatinIsle
1479907300 A few more items consolidated 2023-09-22 22:47:06 +01:00
SatinIsle
a851fdbed7 Condensed single fantasy items into one file 2023-09-22 22:27:38 +01:00
SatinIsle
dd43657b59 Fixed sleep error 2023-09-22 22:09:10 +01:00
SatinIsle
0c39b8b7d8 Fantasy redgate map
Added a new fantasy redgate map that consists of a fantasy town and a large dungeon beneath it.

Added a selection of fantasy props.

Added a variety of "magic" resprites of existing items. These are intended to be tech disguised as magic and have descriptions to hint at it, along with some papers on the map.

Added an alchemy system that creates potions in an alembic out of an ingredient and a base. If the ingredient and base match, an interesting potion is created, if they don't, a poor quality potion is created.

Added a new reagent that polymorphs the drinker into a random creature.

Added a chest version of crates.

Added wooden wall lockers.

Added random spawners for fantasy items, potions, ingredients and bases for mapping.

Added hedge and wooden fences.

Added an old fashioned resprite of the oven.

Added a cooking pot resprite of the microwave.

Added wall torches.

Added barrel version of water tanks, beer tanks, wine tanks, blood tanks and a kettle resprite of a coffee dispenser.

Added a wooden tub bath.

Added 19 new vore mobs: 2 Catslugs, 6 succubi, 1 cryptdrake, 4 vampires 5 peasants and a bat.
2023-09-22 21:44:22 +01:00
Heroman3003
16e36e3041 Merge pull request #15409 from Very-Soft/backtosd
You don't have to fight in the belly if you don't want to
2023-09-23 05:52:18 +10:00
VerySoft
4891aadb80 You don't have to fight in the belly if you don't want to
Adds a var for AI holders called: bell_fight

This var defaults to true, while true the mob will attempt to fight you while it is in a belly.

Prospective mob designers can make AIs that have this disabled though, in cases where you want a mob to give up fighting once it's been eaten.
2023-09-22 15:03:05 -04:00
C.L
4094796adb Stops Gabriel 2023-09-21 18:45:57 -04:00
C.L
b4c3819468 All birds are dinos, but not all dinos are birds 2023-09-21 18:37:42 -04:00
Heroman
2c5c0b3d6a Attempts implementation of char setup vore panel 2023-09-21 06:10:18 +10:00
Casey
be2368aa8e Merge pull request #15401 from KillianKirilenko/kk-mini1
HOT Paper Scooping ACTION: the SEQUEL
2023-09-17 14:00:04 -04:00
Casey
f01bd05a7d Merge pull request #15400 from KillianKirilenko/kk-timestamps
Time: Stamped
2023-09-17 13:56:09 -04:00
Casey
7eb4aec7d1 Merge pull request #15398 from Very-Soft/spacenazis
Remove all mention of nazis from code
2023-09-17 13:54:03 -04:00
Killian
92ca777c4e paper scooper ii: the reckoning 2023-09-16 11:01:40 +01:00
Killian
8d682815a2 time: stamped 2023-09-16 10:26:23 +01:00
Heroman3003
cfdd2cc92f Merge pull request #15395 from ItsSelis/mob-spawner-additions
Health & Damage in Mob Spawner
2023-09-16 05:55:03 +10:00
Heroman3003
32fddb5966 Merge pull request #15394 from Screemonster/loar
modifies puffercarp cataloguer entry
2023-09-16 05:54:40 +10:00
VerySoft
9337bc2546 Also removes hitler 2023-09-14 17:57:57 -04:00
VerySoft
5555509ca5 CAH cards 2023-09-14 17:48:20 -04:00
VerySoft
b4922aedc9 Remove all mention of nazis from code
Also removes some old lore references from the listening post
2023-09-14 17:43:57 -04:00
Selis
8c0f6e4b94 Health & Damage 2023-09-13 00:43:05 +02:00
Heroman3003
ab7cb2112f Merge pull request #15377 from KillianKirilenko/kk-blood
Blood Reagents Refactor
2023-09-13 07:51:31 +10:00
DESKTOP-4BUBN9N\Mike
3bd3949145 modifies puffercarp cataloguer entry 2023-09-12 22:43:43 +01:00
Killian
8ce5d24277 blood reagents refactor 2023-09-12 20:17:23 +01:00
Heroman3003
adb940330f Merge pull request #15392 from Runa-Dacino/motdrespawn
fix(nif_tgui): Fixes TGUI interact on ghosts
2023-09-13 05:09:45 +10:00
Runa Dacino
dd1f9c6ddb fix(nif_tgui): Fixes TGUI interact on ghosts
Normally, TGUI is fine to be observed by ghosts - thus attack_ghost() calls it on left click in addition to examining.

Unfortunately, NIFs require ishuman() vars to be accessed, causing runtime errors.

Unfortunately x2, the way TGUI is set-up, observers override tgui_state checks that would enforce ishuman() state checks.

Therefore, we must modify tgui_interact to reject attempts to call the interface for non-human mobs.
2023-09-12 14:06:28 +02:00
Casey
c77515d171 Merge pull request #15384 from SatinIsle/fantasy
Fruit spawners
2023-09-11 20:22:17 -04:00
Casey
26d7b5bab9 Merge pull request #15383 from Very-Soft/fancy
Fancy!!!
2023-09-11 20:21:24 -04:00
Casey
b3be17b5a0 Merge pull request #15382 from Screemonster/spicyfugu
adds puffercarp
2023-09-11 20:21:14 -04:00
SatinIsle
4fa37872dd Fruit spawners
Added fruit spawners that can be mapped in, each one spawns one of the desired fruit/veg/mushroom/whatever on initialising.
2023-09-12 00:09:56 +01:00
VerySoft
9327ccb9a1 Fancy!!!
Makes a few changes to things, most of which are functionally identical to before.

Changes the shadekin empathy color to something unique, and more visible in dark mode than the changeling color. Also gives it a special font.

Makes a slightly lighter color as an alt color for dark mode

Makes it so that hivemind languages don't HAVE to be italics, but makes it so all the existing hivemind languages minus shadekin empathy are italicized. (The font I picked for empathy was hard to read while italics)
2023-09-11 18:18:12 -04:00
DESKTOP-4BUBN9N\Mike
c43cb9e920 fix the linters 2023-09-11 19:57:42 +01:00
DESKTOP-4BUBN9N\Mike
60b815e0b0 adds puffercarp 2023-09-11 19:35:17 +01:00
TankTheBirb
5c4816d537 adds a log to solar grubs E X P A N D I N G
mostly because this might be important to have

Also I didn't test this because I am at work so it will either work or it won't or it will delete everyone's left arm for no discernible reason
2023-09-11 11:19:30 -04:00