Commit Graph
1054 Commits
Author SHA1 Message Date
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
Heroman3003andGitHub 864248da9b Merge pull request #15424 from KillianKirilenko/kk-laserdome
Redgate Laserdome
2023-12-03 11:07:22 +10: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
FartMaster69420 df1ca07ad6 Update l3closet.dm
Added the Xenobiology Bag to the standard Level 3 Science locker, previously it was only in the double locker which some maps didn't have.
2023-11-20 22:06:33 -05:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Killian 6cafbe5dce laserdome: miscellaneous additions
multimode lasertag guns with multihit rules, non-rotating mannequins, and new laserdome-specific gear lockers
2023-10-10 09:32:30 +01:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10: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
Heroman 347d44d05c Two small fixes 2023-08-27 11:41:12 +10:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Killian 64590b4f0f emergency beacon 2023-08-18 13:46:25 +01: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
izac112 ff7df50a7e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-21 19:03:35 +02:00
ItsSelis 10d2178516 More 515 Compatibility 2023-06-05 19:29:40 +02:00
izac112 9cedb2ec47 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-03 19:53:45 +02:00
Youtubeboy139 f41ff986ff New Hydroponic Items/Sprites 2023-05-31 22:12:32 -04:00
Killian 058c57a299 fix merge conflict, add dept gorkas to selectors 2023-05-25 01:03:17 +01:00
Heroman3003andGitHub df699feabc Merge branch 'master' into kk-nanofix 2023-05-25 09:55:05 +10:00
Killian 0fb46b59a3 tg clothing polish 2023-05-24 19:59:31 +01:00
Killian b06da3aa06 gorkamorka
more gorka suits
2023-05-23 17:19:59 +01:00
Detective-Google f8fb3a13f9 adds overwear + makes most of the clothing obtainable. 2023-05-19 02:06:34 +01:00
izac112 4cc81d7c73 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-03-19 22:24:48 +01:00
Killian 08afddcf5e organ boxes 2023-03-13 23:10:32 +00:00
Heroman be68f044d7 Makes SD wall lockers properly visible 2023-02-26 15:34:25 +10:00
VerySoft 985fe881cb Misc fixes
While I was working on kobs I fixed and tweaked a whole bunch of little things. I figured even then that I should separate the fixes, but I never got around to it

Now I have~
2023-02-17 13:46:02 -05:00
izac112 f61e9a6a39 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-29 21:52:44 +01:00
Heroman 655116c3d1 Fixes personal lockers robbing borgs of their modules 2023-01-04 15:59:46 +10:00
izac112 904e960b04 Exploration is staying on yawn 2023-01-03 21:13:11 +01:00
izac112 53f54d78e6 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-03 21:12:41 +01:00
PandoraandGitHub 9c32488fe2 Update misc_vr.dm 2022-12-25 17:28:39 +00:00
Unknown 90effc3caf Fixes some Oversights
- Removes Phasers from cargo ordering
- Removes weapons and combat armor from Talon
- Renames access_awayteam back to access_explorer for compatibility reasons
- Standardizes the itempath of the buffer device across all three maps.
2022-12-23 19:25:47 -05:00
VerySoft ed03ce8262 Yeah! 2022-12-22 01:27:29 -05:00
VerySoft 415742c4f0 c: 2022-12-21 04:34:05 -05:00
izac112 ff37a7ac7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-11-02 13:33:47 +01:00
TheDavestDave a9a2029e4c adds a pair of great tits to cargo
sorely needed
2022-10-24 19:05:12 +01:00
izac112 dc36fe9b8f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-10-16 22:52:41 +02:00
C.L 6eb311dc1d More changes
- Makes a special wire reader tool that the CE starts with
- Makes CE blueprints able to add charges to Engineer's blueprints.
- Makes it so CE blueprints don't have the wire legend.
- Adds Engineer's blueprints to the Engineer's lockers.
- Adds Engineer's blueprints.
- Makes it so you can't make a new area in a non 'BUILDABLE_AREA_TYPES' area without CE blueprints. (See global_lists_vr).
2022-10-01 21:04:47 -04:00
C.L b103587ec6 Replaces references to blueprints.
Old blueprints are gone now.
2022-10-01 02:04:59 -04:00
1144101012 [MIRROR] Adds job winter coats to job lockers (ABLE TO BE MERGED) (#12904)
* Adds job winter coats to job lockers

* Update hooded.dm

* Update wardrobe.dm

* Update security.dm

* Update scientist.dm

* Update medical.dm

* Update cargo.dm

* Update job_closets.dm

* Update job_closets.dm

* Update hooded.dm

Co-authored-by: Spookerton <spkrtn@pm.me>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:02:22 -04:00
NovacatandGitHub 1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
MistakeNot4892 d717a4b50a Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298 2022-08-25 14:26:20 +10:00
izac112 8f96195fdb Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-23 13:40:54 +02:00
Heroman 9bfa59355b Adds double engi closets for SD and RP 2022-07-17 09:10:25 +10:00
izac112 71d069887c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-08 15:49:48 +02:00
PandoraandGitHub 1fec9b4bac Update security_vr.dm 2022-07-03 05:13:34 +01:00
ItsSelis 4a9784c2a0 Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8644-fix 2022-06-18 14:58:10 +02:00
ItsSelis bb87687017 Resolve conflicts 2022-06-18 14:57:51 +02:00
ItsSelis 9069ca7f35 Enables to un-anchor the Bins 2022-06-16 15:46:26 +02:00
izac112 891967a990 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-06-06 15:26:15 +02:00
KetraiandVirgoBot 0937f3a381 Cooking QOL V2 2022-06-05 20:17:44 -04:00