Commit Graph

13413 Commits

Author SHA1 Message Date
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
Cameron653
97e851f2e4 Adds in body snatcher device (#1822)
* Adds in body snatcher

* Modifies method the bodysnatcher works

* Fixes merge & compile error

* Update trash_pile.dm

* Update trash_pile.dm

* Gets transfer_to to work
2017-07-19 15:26:34 -04:00
Cyantime
8f5034035d Advanced scanners now identify NIFs 2017-07-17 00:31:38 -04:00
Spades
5672fbe648 Merge pull request #1839 from VOREStation/tether-changes
Tether changes
2017-07-08 23:13:22 -04:00
Spades
619206f651 Update trash_pile.dm
oops
2017-07-08 14:30:34 -04:00
Spades
929e872ee3 Tether changes
- Reduced trash piles by probably half. There shouldn't be more than one
trash pile in any room.
- Replaced steel beds with comfy beds everywhere.
- Removed syndie ID from trash pile, because there's absolutely no way
to detect it by Security, making it OP.
- Added sizegun to trash piles. Is technically not contraband, so enjoy.
2017-07-08 11:54:49 -04:00
Spades
6d16544762 Update flora.dm 2017-07-08 11:05:39 -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
c130fb913e Merge pull request #1834 from VOREStation/wilderness-additions
forgot this
2017-07-07 23:41:14 -04:00
Spades
e19bcef832 forgot this 2017-07-07 23:39:59 -04:00
Verkister
6a633f6c51 More otie stuff.
-Took out the minimum oxygen requirement from space oties. They all died outside as oxygen was not one of the gases there.
-Moved guard otie to security category in cargo.
-Moved the collared otie from pred crate to its own crate. Bare one is still in the pred crate chances.
-
2017-07-07 17:07:15 +03:00
Spades
d3b1bba301 Merge pull request #1823 from VOREStation/SpadesNeil-trashpile-patch
Radio jammer trash frequency nerf
2017-07-07 01:26:54 -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
6a1d844f7a Radio jammer frequency nerf
The radio jammer is very obnoxious, and I feel like it should not appear as often as it does. Every shift I have been on since its addition has seen a jammer easily located.
2017-07-06 15:33:34 -04:00
Spades
d47b9d5df1 Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof
# Conflicts:
#	code/modules/mob/living/simple_animal/vore/otie.dm
#	icons/mob/vore64x32.dmi
2017-07-05 11:33:24 -04:00
Spades
f13aa4c60f Merge pull request #1800 from Verkister/master
Taur and borgo feature shieet!
2017-07-05 11:30:24 -04:00
Spades
09d351aff9 oops 2017-07-04 20:09:04 -04:00
Spades
357e8491c0 Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof 2017-07-04 20:04:19 -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
Verkister
7333ea008f Taur and borgo feature shieet!
-Added a counter for janihound to keep track of how much crap it's ate.
-Lowered janigut capacity to 25 items.
-Made mice edible for the borgo.
-Gave a gentle touch to the wolftaur sprites. (more types later?)
-Added a saddlebag version that fits itself for every quadtaur.
-Added a robust combat aesthetic saddlebag as a childtype to the forementioned.
2017-07-03 21:05:17 +03:00
Spades
4da487d547 Spawns Detectives with a .38 revolver.
At some point I'll make it possible to pick different skins on your
revolver. You at least get this for now.
2017-07-02 15:34:44 -04:00
Spades
74b3a971ac Merge remote-tracking branch 'refs/remotes/origin/master' into gateway-stoof 2017-07-02 12:49:29 -04:00
Spades
08704251b2 Merge pull request #1793 from VOREStation/guns
Dakka Dakka
2017-07-02 02:29:46 -04:00
Spades
36f32b1ab6 Merge pull request #1756 from Verkister/cargoandborgo
Cargo and borgo stuffs. [change check a whole week overdue!]
2017-07-02 02:20:25 -04:00
Spades
2f9c8b48b4 Merge remote-tracking branch 'refs/remotes/origin/master' into guns 2017-07-02 00:30:23 -04:00
Spades
6af39bea3f Trying to make a syndie base 2017-07-02 00:28:19 -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
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00
Anewbe
2dd8f33ecd Merge pull request #3543 from Neerti/6/24/2017_aooc_for_nonadmins
Adds AOOC functionality for antags.
2017-06-25 16:34:15 -05:00
Anewbe
12be304ba4 Merge pull request #3528 from VOREStation/aro-pol-defibs
Ports Bay/Paradise Defibs
2017-06-25 16:15:01 -05:00
Anewbe
2bd869026a Merge pull request #3534 from Neerti/6/13/2017_infiltrators
Adds a new Infiltrator Gamemode (Team Traitor)
2017-06-24 12:32:16 -05:00
Neerti
1cfd2f08f2 Adds AOOC functionality for antags.
AOOC can be granted on a per-antag type basis.  If the type has can_use_aooc equal to true, they can both use and see AOOC.  It is true by default to allow for the upcoming Infiltrator type to automatically be able to use it.
The types disallowed from AOOC are ERT, Traders, and Renegades.  This means admins can now use AOOC to talk to the real antags and not the ERT.
2017-06-24 12:31:18 -04:00
Verkister
e2c749288d A shave.
-Replaced unnecessary fluff mentions with something else.
2017-06-23 09:56:24 +03:00
Verkister
0499fec8b8 Minor adjustments.
-Small health nerf for unarmored oties.
-Comment blabbery.
-Halved crate chance for the cosmetic difference oties (like the bears do I think?)
2017-06-23 09:25:24 +03:00
Spades
ee7c895d07 Merge pull request #1767 from VOREStation/HoS-Nerf
HoS gear nerf
2017-06-20 01:24:31 -04:00
Spades
3bbc518978 Merge pull request #1752 from VOREStation/aro-nonlethals
KHI-102b "NSFW" Handgun
2017-06-20 01:21:12 -04:00
Neerti
2e1ae6f49f Merge pull request #3538 from Cameron653/BDF
Blast Door repair & damage fix
2017-06-20 00:59:16 -04:00
Neerti
470c80e8eb Merge pull request #3448 from Anewbe/ling_claws
Adds ling claw power
2017-06-20 00:54:23 -04:00
Spades
df7d0eb05f .dm file changes first 2017-06-19 22:29:24 -04:00
Verkister
978363021f Retry for the cargo and borgo stuffs.
-Added Eggnerd limb design disk to the mail order pack.
-Added the non-security oties on the pred crate picklist.
-Added mail order guard puppy crate. (the frankensteinian voremobcode+followerpetcode+beepskycode combowombo)
-Attempts a workaround for janihound belly not bulging from people. (I swear it was working before the merged code cleanup :v)
-Janihound sprites centered properly.
-Made remains(mouse skeletons etc.) edible again.
2017-06-18 04:01:14 +03:00
Arokha Sieyes
bd39011ab4 NSFW Gun
Also fixes slidey walls at centcom, gives the ERT commander a NSFW with stun, xray, lethal, and net. Gives deathsquad a full NSFW kit (including 'final option' ammo), replaces my own fluff Hunter with a NSFW with stun and net (so, same as the hunter, but that sprite is so badass I can't help it), and fixes a typo on my permit while I'm on there (KIN isn't a thing, KHI is).
2017-06-17 15:44:52 -04:00
Cameron653
2b85c7eafc Update blast_door.dm 2017-06-17 00:08:54 -04:00
Neerti
dbdc88dd88 Adds a new Infiltrator Gamemode (Team Traitor) 2017-06-16 18:03:10 -04:00
Anewbe
3997a1510a Merge pull request #3526 from VOREStation/stonedmc-update
StonedMC Update & Hookup
2017-06-16 16:22:26 -05:00
Anewbe
99320866b0 Merge pull request #3530 from VOREStation/qdel-hints-gen-4
Qdel Hints Round IV
2017-06-16 16:21:58 -05:00
Anewbe
7cb81853a4 Merge pull request #3529 from VOREStation/qdel-hints-gen-3
Qdel Hints Round III
2017-06-16 16:17:33 -05:00