Commit Graph

36 Commits

Author SHA1 Message Date
Heroman
9b56460487 Fixes a typo 2019-04-02 17:57:30 +10:00
Heroman3003
eebd7c64a9 Fixes passive and mostly passive mobs blocking the way all the time 2019-04-02 09:27:24 +10:00
Sebbe9123
bd89126955 Fixes random_vr except oties 2019-02-18 09:08:36 +01:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Unknown
7324e5f1dc Splits first aid kit spawning
Removes the override on first aid kit spawning preventing combat kits from being spawned, but adds a new 'Tetheraid' first aid kit spawn to prevent combat kits from spawning on the Tether, but allows them for expedition sites which still use random spawns.

Also changes the obj/random/maintenance randomly generated item to also only spawn 'Tetheraid' first aid kits, since it shows up twice on the Tether.

TL;DR, it splits first aid kit spawns into one for use on the Tether, which do not have a combat first aid kit, and one used outside the tether (such as POIs) which do have the possibility of spawning a combat first aid kit.
2018-10-21 20:49:25 -04:00
Arokha Sieyes
5bf8dd9caa Remove combat medkit from station spawns
It's pretty damn powerful for something you can just randomly find in several spots on the station.
2018-02-26 15:26:27 -05:00
Leshana
ef3df27528 VOREStation Specific Merge Changes
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
2018-02-17 16:56:31 -05:00
Arokha Sieyes
dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
Leshana
fe431c8e46 Trims back wilderness code that was dependent on tether map.
* Reverted random.dm back to Polaris as there is no need for the VOREStation customs.
* Fixed /obj/random/outside_mob so it will actually work (You can't set vars on a type!)
* Removed all wilderness code outside of the tether map.  It was only setting life_disabled on mobs spawning there. We can do that with a subsystem or by dynamic maploading instead.
2018-01-17 15:23:22 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Cameron Lennox
e650c62c6b LOTS OF FIXES 2017-10-08 18:05:27 -04: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
killer653
923e6a9677 Fixes compile errors. 2017-08-28 21:04:53 -04:00
Spades
18ffeefafd Removies oties and outdoors area 2017-08-26 15:51:37 -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
Cyantime
3f48e8ae07 Attempted wilderness performance increase (#1841)
* Attempted wilderness performance increase

* might as well

* Edit comments

* Moves alien change out of polaris file
2017-07-19 15:30:22 -04:00
Spades
190d532f05 One last thing 2017-07-08 01:28:31 -04:00
Spades
b5f86eece2 Merge remote-tracking branch 'refs/remotes/origin/master' into wilderness-additions
# Conflicts:
#	code/modules/mob/living/simple_animal/vore/otie.dm
2017-07-08 01:26:47 -04:00
Spades
19a6895e3c Fixes 2017-07-08 01:24:55 -04:00
Spades
e19bcef832 forgot this 2017-07-07 23:39:59 -04:00
Spades
1c6e63cd51 Wilderness atmos fix (#1826)
* Atmos and mob faction fix

Should reduce lag substantially and stop planetary phoron fires.

* Active Edges

* fuck you Travis you unhelpful shit

* Testing probable problem area.

* Is THIS it?!

* Long shot, but let's try it.

* Just to kick Travis again

* oops
2017-07-07 01:09:42 -04:00
Spades
09d351aff9 oops 2017-07-04 20:09:04 -04:00
Spades
0540593119 Final additions and fixes 2017-07-04 20:01:38 -04:00
Spades
4367bc2da7 sleepy commit 2017-07-04 06:38:32 -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
Arokha Sieyes
6ada64082b Adds Trash Piles
Replaces some lockers and racks in maintenance with trash piles. They are presistent loot piles for people who just can't help but greytide. It allows people who join later in the shift to still get goodies. Each is searchable once per shift by each ckey.

They have three loot lists: alpha, beta, and gamma.

Alpha has the highest chance and just random maint stuff. All usable items (no random empty beer cans) but nothing you couldn't find elsewhere.
Beta has a lower chance of spawning and is usually contraband, mechaically useful stuff. Radio jammers and the like.
Gamma is dangerous or highly illegal contraband, and is unique. Guns (nonlethal!), teleporters, syndicate IDs, etc.

Gamma items have special handling: all of the trash piles share a gamma list, and when an item is given out from the gamma list to someone, it's de-pooled so that another trash pile won't hand it out. The pile-collective maintains a reference to it as an 'allocated' gamma item though. Then, when the gamma list runs out, it reviews allocated gamma items to find any that it might be able to 're'-distribute. Namely ones that have been deleted, or are in cryopod computers because the user left with them. It can then hand that item out again. If it cannot hand out a new gamma item, it gives beta instead.

You can also just manually put gamma-list items back into the piles if you're leaving. Or, if you find a translocator, but already made yourself one in R&D (or later make one), or you're the RD and find a bluespace harpoon, you can stuff the translocator/whatever back into any trash pile and it'll be re-pooled into all of them. You can only return gamma items this way, not beta/alpha.

Additionally, if you find yourself playing a simple animal mob for an event (or you're a mouse), you can hide in trash piles by clicking them. There's a 50% chance you're revealed if the pile is searched. You can climb out by clicking the pile again. I dunno if that'll ever get used but it was easy to code, so eh.
2017-05-31 18:36:00 -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
Arokha Sieyes
ef43dfa816 Add some 'single' random spawns to the maps
A single netgun will always spawn somewhere on the map, but the location is random.
Either a bluespace harpoon or a translocator will spawn somewhere on the map, but never both, and location is also random.

Keep in mind they have a chance of spawning in maint where they can be easily grabbed... or spawned into one of those closed-off walled-in single rooms that are occasionally in the walls with stuff in them, so you might not see them every shift.
2017-05-22 18:12:37 -04:00
Arokha Sieyes
85fbc527a3 Nearing playtest time 2017-02-13 20:24:54 -05: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 59e2bb211759604a95319ce6b1c74219a4b60800.

* 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
Spades
76e2fa3184 Contraband updated (#618)
Battle rifle and other non-contraband removed.
Added various new contraband to the list.
2016-10-01 22:25:12 -04:00
Spades
e8b112fdc1 Contraband Update (#564) 2016-09-18 23:17:55 -04:00