Commit Graph

36 Commits

Author SHA1 Message Date
Cameron Lennox 0e24446f12 Icon Fixup [IDB IGNORE] (#18284)
* Begin the sprite consolidation

* med stand

* Library

* kitchen cart

* hydroponics

* Delete hydroponics_machines_vr.dmi

* furniture

* unused computer

* food

* fitness

* fixes the eggs

* Decals

* Drinks, Devices, and Drakie

* Cryogenic2

* combines

* chemical

* card new

* cards

* bereaucracy

* Xenoarch

* compile

* virology

* vehicles

* toys

* Surgery

* stationobjs

* clean these up

* gets rid of some dupes

* bye

* how did that get there

* Unused

* Gets rid of unused ninja dupe file

* Move all these old doors

* this too

* get rid of dupes

* Update airlock_angled_bay.dm

* fixes the map with a prop

* map fixes
2025-08-17 19:09:57 -04:00
Kashargul cdfa1c853f New to init final (#17512)
* Initial

* some more

* next few

* only light left

* fix things up

* some rmore fixes

* guh

* Update ai_vr.dm

* comment

* lets try something

* .

* hmm

* .

* .

* hmm

* push that here

* fix layout

* grrr
2025-04-14 00:07:35 +02:00
Nadyr 2cd150b294 fixes fireaxe path (#16504) 2024-10-22 20:48:56 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
Heroman fbb0a65231 Brings REAL cookies to everywhere they belong 2022-03-07 18:44:53 +10:00
klaasjared 18b3d72f37 Small changes 2022-03-01 18:57:45 -05:00
klaasjared e4ed93e11d Shotgun Ammo Boxes
Replaces all ammo boxes with new ammo box type (Alt-Click to remove shells) - put in separate Commit in case Admins don't want this

(Compile Fixes)
2022-03-01 01:27:54 -05:00
klaasjared dc2bc419c1 Secondary Commit 2022-02-28 22:17:03 -05:00
VirgoBot 737c473e4b [MIRROR] :siffet: (#11584)
* :siffet: code

* Siffet suit icon merge

* Fix path

* Fix OTHER path

Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2021-10-24 19:49:05 -04:00
Aronai Sieyes e52031d6aa Make stack amount var private 2021-08-19 21:06:46 -04:00
Aronai Sieyes 669d23322c Change various things to subtypesof() 2021-07-20 12:54:59 -04:00
MarinaGryphon 577b986ba6 Convert some bools to TRUE/FALSE instead of 1/0. (#11100)
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2021-07-16 13:43:25 -04:00
ShadowLarkens 2847ea4bbd Fix cookie having no icon (convert everything to cookiesnack) 2021-05-21 20:06:31 -07:00
Killian 8198f012d4 wrecked cargogeck for debris field, new decals for movable mack walls 2020-09-20 00:37:58 +01:00
Aronai Sieyes 7d69c69f14 VS: Port Bay's lockers and stuff 2020-05-31 12:26:00 -04:00
Aronai Sieyes 3f4fd59bd0 VS: Fix weird leather thing 2020-05-18 10:28:27 -04:00
Sebbe 224ce6582b Hopefully fixes every path
plz game, I didn't have fun ;w;
2019-04-16 10:41:04 +02:00
Cameron653 9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Mewchild 6f4f352b0d Map changes for explorers 2018-05-09 11:36:26 -05:00
Arokha Sieyes dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
killer653 3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Spades 07762f31e7 Some disorganizes changes by Aces
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
2017-09-21 03:22:20 -04:00
Spades a19a4e2549 This should be anchored...
Direct pull because ssshhhhh no one sees me.
2017-08-30 17:40:26 -04:00
killer653 923e6a9677 Fixes compile errors. 2017-08-28 21:04:53 -04:00
Spades 1ef09a64d1 Removes SVD 2017-08-08 01:17:29 -04:00
Spades 7db8de3530 MERGE 2017-08-07 16:55:50 -04:00
Spades 2f9c8b48b4 Merge remote-tracking branch 'refs/remotes/origin/master' into guns 2017-07-02 00:30:23 -04:00
Spades 3db35eb684 Dakka Dakka
- Removed gun_vr judge, Polaris has one now.
- Removed vorestation m44 mags, Polaris has those now.
- Removed detective's .44 magnum because NO YOU CANNOT HAVE A FUCKING
MAGNUM
- Corrected inconsistent naming of .44 speedloaders
- Corrected inconsistent naming of .357 speedloaders
- Fixed broken calibers for .357 stuff to be consistent with upcoming
Polaris sync.
2017-06-30 22:42:08 -04:00
Leshana 1507a0330c Fixes ammo paths changed by PolarisSS13/Polaris/pull/3541 in VOREStation custom code. 2017-06-30 22:34:15 -04:00
Leshana c4bdc4c027 Updated VOREStation specific files for the ammo path reorganization.
* Updated paths in dm files
* Updated references in all dmm files for tether, virgo, and randomz
2017-06-02 12:18:13 -04:00
Leshana 8c8e04a0a0 Converted VOREStation custom guns and ammo to handle the swap of 5.56 and 7.62 ammo.
* Swapped our loot drops and guns to keep the damage of loot and guns the same.
* Edited the c762 magazine definition back to keep the same ammo count in each magazine type as before.

Conversion chart used:
==OLD==     max_ammo    ==NEW=      max_ammo
a556        10          s762        10
a556m       20          c762        (20)

s762        10          c556        20
c762        20          c556/ext    30
a762        50          a556        50
2017-05-26 17:54:04 -04:00
Leshana f0270451a7 Added vore capabilies to the new simple_animal system.
* Added happy friend time mechanics working properly for fox and cat.
* Added vore mechanics and vore overrides
* No longer enable vore on simple animals by creating a "/vore" subtype.  Instead we simply enable vore on the main type.  Consensus being we don't need a type for non-vore versions of stuff.
  * This allowed us to revert many path references throughout the codebase to the original non-vorestation back to their original values.  In these cases the "Vorestation Edit" comment is removed.
* Moved the vore overrides for upstream simple animals into its own file zz_vore_overrides.dm
2017-03-22 19:32:19 -04:00
Leshana 17c74c17fc Updated our custom items and maps to account for the path changes for boots! 2017-03-06 21:46:35 -05:00
Spades 3593e07f0b Symbol fix (#637)
[REDACTED]
2016-10-09 20:05:49 -04:00
Spades 05869b0d9b Zoo.dmm added, Vault updated, various bugfixes (#634)
* :(

* Ports https://github.com/PolarisSS13/Polaris/pull/2571 early.

Need this for a map I wanna do.

* need sleep

* Emergency meds added

Resolves https://github.com/VOREStation/VOREStation/issues/600

* Fixes Fax Machine showing Sif Government

* Updates Tajaran lore to match Polaris.

* Sleeping for tonight

* Fixes #623

* Added more to the map

* Fox sprites from Paradise added

* Vore bee added

* Technical stuff no one cares about.

* Another update

* Reverts Pull #508

https://github.com/VOREStation/VOREStation/pull/508 messed up digesting
dead mobs and mice.

* Sergaling are now Saru.

* Saru

* Zoo map update, near completion

* Zoo map finished, plus Station Vault updated

* Revert "Ports https://github.com/PolarisSS13/Polaris/pull/2571 early."

This reverts commit 59e2bb2117.

* Buzz off, Travis.

* Removed microwaves entirely so Travis stops bitching

* Travis stop being dumb

* Fix the zoo map once and for all..?

* Removes backup files.
2016-10-09 18:55:17 -04:00
Leshana 8025076fa2 Issue #23 - Ported the carpfarm and listeningpost away mission maps (#96) 2016-05-17 20:35:28 -04:00