Commit Graph

313 Commits

Author SHA1 Message Date
Guti
f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
Kashargul
8a3520e2e0 move all factions to defines 2024-09-12 20:17:41 +02:00
Guti
409aaba802 Remove 2024-09-09 02:36:53 +02:00
SatinIsle
791e259f63 Hanner Whitelist Species
Added a new whitelist species, the Hanner. These are the half-offspring of Lleill and share a small number of their abilities. Notably, they are shapeshifters, can drain energy from consenting people, can do basic alchemy and can transform into beasts.

Added the beast form ability to Lleill and Hanner, allowing them to turn into a small selection of simple mobs.

Changed lleill_energy and lleill_energy_max to be a base species variable rather than lleill species, allowing those abilities to be granted to other characters by GMs.

Added a small chance of finding potion materials in maint loot (pretty rare), to allow a little more consistent use of the alchemy ability for lleill, rather than relying on redgates alone.
2024-09-06 12:20:47 +01:00
Killian
1e49f4bdb5 Supply System Updates (#16161)
* supply system updates

* supply system updates

* Update vorestation.dme
2024-08-22 20:00:14 +10:00
Novacat
8fde8b2923 Adjusts stationside first aid spawns (#16194)
* Adjusts stationside first aid spawns

Stationside first aid kit spawns should not have combat first aid kits

- Swaps stationside first aid kit spawns on Talon, Stellar Delight, and the V2 Outpost to Tetheraid spawns

* Does some more swapping

* Adds stasis bags to wallmeds
2024-08-18 20:40:14 +10:00
SatinIsle
aa15e641ec Monster Bait (#16111)
Added a Monster Bait toy item, a fluffy worm thing on a stick! Dangle it in front of a vore-capable mob and it will prompt them to pounce you without needing to make them hostile.
2024-07-21 19:57:09 +10:00
SatinIsle
3775663482 Mega nukies (#16110)
* Mega Nukies

Added a variety of Nukies called Mega Nukies that can only rarely be found in maintenance loot. These super caffeinated drinks come with a warning label about health hazards and may have the following effects:

The ability to see in the dark perfectly, with a small risk to your eyes.
Good healing of brute and burn damage at the risk of damaging your heart.
Putting you to sleep until you've processed all of it.
Repairing your NIF and filling you up, but confuses you if you don't have a NIF installed!
Hyperzine speed, way less addictive but may cause modest burns!
Gets you real high.
Slowly shrinks you.
Slowly grows you.

* Unique colours
2024-07-21 19:56:52 +10:00
SatinIsle
d27b00d2f5 Butterfly nets (#16088)
Added butterfly nets. These nets can be wafted across a tile, much like a fishing net, to catch butterflies (and people of scale 50% and below)! Using them on themselves either drops the contents, or if the inactive hand is empty, pulls out the contents into the free hand.
They can be crafted from cloth, found in the botanists locker, or rarely found in maintenance.
2024-07-07 20:47:09 +10:00
SatinIsle
70e607b28d Bluespace Crackers (#16062)
* Bluespace Crackers

Added a bluespace cracker item. It works similarly to a normal cracker, in that one person offers it to another to pull the cracker together. When pulled, the winner is rewarded with a toy, a joke, a cheap paper hat and a powerful bluespace effect!

The effects include:
Shrinking to 25% scale
Growing to 200% scale
Having a drug like effect colour their screen.
Making them invisible for one minute.
Knocking them over.
Teleporting them into the losers active belly (if prefs allow!)
Or giving them a bunch of money.

They can be found in the bluespace random item pool and rarely as an item in maint!

* Colourful hats

Added random colours to the paper crown hats

* Added the crackers and backfiring sizegun to trash piles

* Can be rigged by VV now
2024-06-21 06:04:04 +10:00
Heroman3003
bf490b78ac Adds Contaminant Detector HUD (#15970) 2024-05-09 19:37:19 +10:00
SatinIsle
029cae3d27 Maint Pred Availability (#15911)
Added a new maint pred ghostpod for redgates. I have added two of these to redgates that I made only (for now). They are normal ghost pods but are always available from the start of the shift. The can be found in the find ghost pod verb and are called creature holes.

Made a lot more mobs in my own redgate maps ghost joinable. Generally one of each type of mod that isn't a humanoid.

Added a 25% chance for each mob to become ghost joinable from the semi-random vore mob spawners used in redgates. This applies to the passive and retaliate spawners only.

Also made the other redgate maps available on the SD again.
2024-04-10 05:18:47 +10:00
Raeschen
744515e21e fix a bad icon_state, vscode use dmieditor (#15797) 2024-03-02 15:53:33 +01:00
VerySoft
c32d33fad9 Spider
Makes it so that nurse spiders can't spawn from any random sources, such as spider egg clusters, spider spawners, and capture crystals.

GMs and map makers can still put nurse spiders out if they want to, but this should stop any UNEXPECTED nurse spiders from appearing, and stop spiders from snowballing quite so hard when the conditions are right.
2024-01-09 14:59:42 -05:00
SatinIsle
51d46b2a51 Energy drinks
Added a set of new Nukie energy drinks, each with their own reagent that causes jitters after 30u.

Also added a Nukie vending machine to find these drinks in!
2023-12-18 16:34:50 +00:00
SatinIsle
6e848bea8b Desatti vending machine
Added a vending machine that stocks all desatti foods. Included in random vending machine choices.

Added rhubarb and custard sweets.

Added pork pies.

Added a sweets crate to cargo hospitality orders.

Fixed desatti jaffa cake crate having only one box instead of ten.
2023-10-30 17:27:56 +00:00
Heroman
9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +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
SatinIsle
d8ba52dd10 Adds teleportation tome and makes potion bases smaller 2023-09-23 00:28:31 +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
Casey
2288c6d917 Merge pull request #15369 from Runa-Dacino/zorrencopper
Changes blood regen pill instances to contain copper pills due to zorren copper update
2023-09-10 12:57:15 -04:00
Runa Dacino
1b23ff5cdc tweak: Replaces "Iron" pill bottle with blood regen pill bottle
Replaces instances of "iron" pill bottle with the new blood regen pill bottle in containers and maps that are either NanoTrasen or Zorren related. Keeps iron bottles in other maps (mostly specific away mission rewards)

add: Adds Copper pills, Blood regen pill bottles

30 u copper reagent per copper pill. Blood regen contains 9 iron, 5 copper pills now that zorren need copper for treatment
2023-09-10 16:45:26 +02:00
SatinIsle
57499402c0 Bluespace Collars
Added two new bluespace collars. They both control the size of the wearer via signalers. The first one allows you to select the size by clicking on it, and is locked to a code and frequency. The second is made by modifying the first, by adding a signaler to it. This one does not allow you to set the size or code on it, and is only locked to frequency. The size you are resized to is determined by the code that is sent from a signaler.
Adds these to various lists, such as trader items, RnD and maint loot.

Also added a new "random bluespace item" random item spawner for mapping use. It is currently not mapped in anywhere.
2023-09-06 16:24:28 +01:00
PastelPrinceDan
fb01e7b12f transes ur gender 2023-08-24 20:44:43 +01:00
Heroman
9852a24114 A bunch of small fixes 2023-08-16 17:03:05 +10:00
VerySoft
4628e467c2 Tweaks and tidying
Adjusts some types to tidy up the mob list. Put some of the mobs that can vore under the vore tab, removed the clown mobs from /mobs_monsters because they were the only thing in there, so there wasn't really any point in hiding them a level deeper, and generally looked for subtypes that didn't have anything in them, and commented those out. Did you know that telesci is supposed to have a chance to spawn hostile mobs if you mess up? It's true! I may or may not have fixed it, I don't play telesci, but it uses a path that actually has mobs in it now.
2023-07-03 02:09:51 -04:00
Youtubeboy139
bd829ad563 Lighters and Cigs sprite revivals 2023-06-03 21:21:04 -04:00
Heroman3003
9983fc2447 Merge pull request #14821 from Youtubeboy139/2023-EnerGen-Power-Cells
2023 EnerGen Power Cells
2023-06-04 05:09:19 +10:00
Youtubeboy139
b052a4c418 New Thalers 2023-05-31 02:18:01 -04:00
Youtubeboy139
71df4464ab Base Commit 2023-05-21 14:10:57 -04:00
Youtubeboy139
9f625e65d5 Base Commit
Minor Fixes
Found some errors while testing. Fixed.

Minor Fixes
Found some errors while reviewing code. Fixed.

Minor Fixes
Found some errors while reviewing sprites. Fixed.

Major Changes
New Cell Charger icon_update system
New Crap Device Cell
Removes Secborg power cell

Minor Fixes
Found some errors while reviewing code. Fixed.
2023-05-04 12:48:28 -04:00
Killian
f1c168faa2 concussion maul pt3 2023-04-10 07:53:15 +01:00
Killian
2e617f094e Update misc_vr.dm 2023-03-16 15:09:58 +00:00
Killian
08afddcf5e organ boxes 2023-03-13 23:10:32 +00:00
Runa Dacino
66b32b4e0d Adds new POI to RP, creates scug spawner object 2023-03-02 21:53:20 +01:00
Seris02
cdaaba7386 adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 16:33:37 +08:00
Casey
b79105ebeb Merge pull request #13924 from VOREStation/upstream-merge-8752
[MIRROR] speculative fix for obj/random's not being deleted
2022-10-16 17:08:57 -04:00
Casey
417ec7cc0e Merge pull request #13916 from VOREStation/upstream-merge-8751
[MIRROR] Fixes overlooked invisible spawner when mapping
2022-10-16 17:06:12 -04:00
Atermonera
ec35c5ab6d Merge pull request #8752 from Spookerton/spkrtn/fix/random-obj
speculative fix for obj/random's not being deleted
2022-10-16 13:59:28 -04:00
Spookerton
112bb84e91 Merge pull request #8751 from Cerebulon/scrapsprite
Fixes overlooked invisible spawner when mapping
2022-10-15 05:47:37 -04:00
Killian
7022c9f421 new sprite change, old randomize method 2022-10-11 13:17:21 +01:00
Killian
d5f85a5da1 cleans up soap
scrubs the dozen subtypes into a single soap object that randomizes on init, usually an oblong but sometimes a square
2022-10-11 11:39:07 +01:00
Casey
254d4d5032 Merge pull request #13868 from VOREStation/upstream-merge-8726
[MIRROR] Rub A Dub Dub [READY FOR MERGE]
2022-10-09 23:06:16 -04:00
C.L
364cbcdf9c Update misc.dm 2022-10-07 21:58:48 -04:00
C.L
2563930d68 Update misc.dm 2022-10-07 21:58:30 -04:00
Spookerton
b00e344610 Rub A Dub Dub 2022-10-07 16:10:19 -04:00
VerySoft
41b9092bb3 Smole vending tweak
Swaps the asian food vendor for a random vendor spawner, and adds altevian food vendor to the random vendor spawner
2022-10-02 14:42:43 -04:00
VirgoBot
de58b679e2 [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED) (#12899)
* Adds Sjorgen Inertial Shotgun (by H-H)

* Update munitions.dm

* Update visible_weapons.dm

* Update shotgun.dm

* Update guns_and_ammo.dm

* Update munitions.dm

* Update guns_and_ammo.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:05:00 -04:00
Heroman
0123fff2b9 Removes hotfood vendors from station spawning 2022-09-21 08:47:03 +10:00
Novacat
1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00