Commit Graph
6649 Commits
Author SHA1 Message Date
Repede 734ead1be6 Ready to review version 2024-01-18 18:37:54 -05:00
Repede 29fd7df39f Draft 2024-01-18 00:47:56 -05:00
7e33bd1d78 Update code/game/objects/items/weapons/traps.dm
Co-authored-by: Izac Joof Forsgren <izac10@live.com>
2024-01-15 13:25:36 -05:00
quackjack c985b5e1fd Fin 2024-01-14 22:38:14 -05:00
izac112 c8a8aa3c12 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-01-01 20:28:55 +01:00
KashargulandGitHub cf8d3dde40 we can't quite listen in without the encryption allowed 2023-12-31 08:46:43 +01:00
Repede 5e525005e4 Puts RSF back to virgo code (removes whatever we did before) 2023-12-24 01:28:21 -05:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
izac112 bd02ad4b78 Updates readme and fixes books slightly 2023-12-15 09:11:56 +01:00
SelisandGitHub 7ccdbb258f Revert "Revert "12/10/23 - Map swap update" (#15593)" (#15594)
This reverts commit f00d13da66.
2023-12-11 00:22:42 +01:00
SelisandGitHub f00d13da66 Revert "12/10/23 - Map swap update" (#15593) 2023-12-10 23:37:45 +01:00
Heroman3003andGitHub 0c18a049a6 Makes gift wrap display its warnings better (#15584) 2023-12-09 21:58:12 +01:00
KashargulandGitHub 8f1df9b616 pry was missing for firedoors 2023-12-09 05:40:18 +01:00
Heroman3003andGitHub f1f764f36f Merge pull request #15545 from KillianKirilenko/kk-mini1
Protean Reconstitutor
2023-12-03 11:08:56 +10:00
Heroman3003andGitHub 864248da9b Merge pull request #15424 from KillianKirilenko/kk-laserdome
Redgate Laserdome
2023-12-03 11:07:22 +10:00
Killian ce93d40c1c protean reconstitutor
construction, components, and upgrades
2023-12-01 10:54:19 +00:00
izac112 5052f6f672 Merge branch 'release' of https://github.com/VOREStation/VOREStation; branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2023-11-28 16:48:53 +01:00
Heroman3003andGitHub 500fc95e84 Adds altevian cake slice (#15525) 2023-11-19 00:29:47 +01:00
Heroman3003andGitHub 9e7fe393be Merge pull request #15524 from Kashargul/VorebellyRobotOverlayFixes
Vorebelly robot overlay fixes + VTEC toggle
2023-11-18 05:05:50 +10:00
KashargulandGitHub 7b17325809 Vorepanel fixes + VTEC toggle
fixed typo in the vorepanel tgui, resulting in Item Vorebelly Size Mult: not being changebale
fixed a wrong variable use which led to broken sprites in case the Mob Vorebelly Size Mult: was tset to 0.
added VTEC toggle.
2023-11-17 19:46:13 +01:00
KashargulandGitHub d6b2f4c3dd Added a module to allow medihounds and securityhounds to ingest items upon installation. Does not interfer with the maximum 1 person limit. Allows a maximum of 4 items to be ingested with both modules (capability and capacity) insalled. 2023-11-10 20:10:52 +01:00
Heroman cbd0307a0c Fixes some syndie borg items 2023-11-03 11:59:12 +10:00
Heroman cb9f552988 Adds confetti gun (unused for now) 2023-11-03 06:58:13 +10: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
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
SatinIsle 5e3f8677a5 Desatti Catering
Added a bunch of british snacks! Wine gums, pasties, sherbet saucers, custard creams, bourbon biscuits, sausage rolls, scotch eggs and 'shrimps and bananas'.

There is no normal way to obtain these right now, and I will add one soon. But for now I had to get them off my PC to be safe as I am moving my repository.
2023-10-27 19:48:49 +01:00
Heroman3003andGitHub aa29834f8d Merge pull request #15434 from Enzo-Leon/altevian
Altevian Adjustments - Descriptions & Small Tweaks
2023-10-05 06:07:48 +10:00
Enzo-Leon f5cc531bb9 Feedback adjustments for improved sentence structue. 2023-10-02 12:27:31 -07:00
Enzo-Leon f13f395db7 Altevian Adjustments - Descriptions & Small Tweaks 2023-10-02 11:40:19 -07:00
Heroman b255b1a8a3 Fixes belts and pouches not being able to hold power tools 2023-10-02 15:54:41 +10:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
Killian eb1311b7ef laserdome updates
adds entertainment radio key, amongst other things
2023-09-26 18:21:12 +01:00
SatinIsle ff5c25b61b Removed the scroll from health.dm AGAIN 2023-09-22 22:39:45 +01:00
SatinIsle f1912f6d9c Marked new file and fixed accidental revert on health analysers 2023-09-22 22:37:25 +01:00
SatinIsle a851fdbed7 Condensed single fantasy items into one file 2023-09-22 22:27:38 +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
Killian cd7d9482e5 locks & keys 2023-09-19 12:25:54 +01: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
Killian 8ce5d24277 blood reagents refactor 2023-09-12 20:17:23 +01:00
CaseyandGitHub 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
Heroman3003andGitHub 94986e7426 Merge pull request #15361 from Runa-Dacino/zorrencopper
Makes Zorren blood actually based on copper: Iron no longer regens their blood, copper is needed
2023-09-10 08:57:38 +10:00
Runa Dacino eca94f7854 tweak(species/chemistry): Makes zorren need copper for blood
Changes iron reagent to no longer regenerate copper for zorren
Changes copper reagent to regenerate blood for zorren
Adds IS_ZORREN reagent_tag define and applies it to species
Updates medical scanner guide to recommend using copper for zorren and skrell
2023-09-07 15:24:27 +02:00
SatinIsle 9d7a1329e0 Redgate train map
Adds a new redgate map: A moving train. A long, linear map with two levels, all aboard a moving train. Has a few things to find and mobs to eat/get eaten by. lots of different rooms, mostly to vibe in. Very very deadly to fall off of, but has railings everywhere except one roof section.

Adds a new death step_trigger, which deletes the body of the person who steps on it and gives them a message about how they died. Also logs and messages the admins so that it can be tracked easily.

Adds a new subtype of ticket printer, which prints permits instead, only little pink tickets. Idea is for them to be used for train tickets if someone wanted to RP a train conductor, but made them broad so that they can be used for anything. Does not add the message to the end of round report, but does notify the staff when a ticket is produced to prevent abuse.
2023-09-05 13:25:10 +01:00
Heroman ba7b9f46a6 Adds Entrepreneur job, as well as new Entertainer alt-title 2023-09-01 07:43:55 +10:00
Heroman db80e2cef1 Removes random burn chance from cheap lighters 2023-08-31 06:47:53 +10:00
izac112 609069d507 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-25 18:19:39 +02:00
PastelPrinceDan fb01e7b12f transes ur gender 2023-08-24 20:44:43 +01:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Heroman 71e124718e Adds food vore 2023-08-22 20:12:24 +10:00