cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 14:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,167 Commits 8 Branches 26 Tags
488fdf85eccdfc61c7f1c212bc9d285a04594de8
Commit Graph

1634 Commits

Author SHA1 Message Date
Aronai Sieyes
49e945afb7 Merge pull request #3023 from Screemonster/stopkillingthedamncat 
Adds newspapering, fixes mob digestion toggle, and other tweaks
 2018-02-16 19:33:20 -06:00
Screemonster
33a384d5c3 makes them swat back, tweaks to exclude list 2018-02-16 10:19:12 +00:00
Arokha Sieyes
61dc4f53fc Refactor step code, and taur messages 2018-02-15 21:43:48 -06:00
Aronai Sieyes
67c7641d36 Merge pull request #3042 from Heroman3003/slugfix 
Fix for crushing and new descriptions for Taur stompies
 2018-02-15 18:17:03 -06:00
Aronai Sieyes
1dd86332d3 Merge pull request #3035 from VOREStation/aro-3022 
Additional safety checks for removal of AI hologram
 2018-02-15 18:05:22 -06:00
Aronai Sieyes
702997ffba Merge pull request #3036 from VOREStation/aro-3010 
Fixes NSFW mode selection
 2018-02-15 18:00:26 -06:00
Heroman3003
7b6ac1391f fix for condition 
dumb error
 2018-02-16 07:24:05 +10:00
Heroman3003
b0a627463b fix for crushing and taur stepping expanded 
More descriptions for different intents of stepping for different taurs + fixed harm trampling not dealing any damage
 2018-02-16 07:13:22 +10:00
Arokha Sieyes
2dffd17c39 Fix #3010 2018-02-15 02:46:11 -06:00
Arokha Sieyes
6c9526cec6 Fixes #3022 2018-02-15 02:42:00 -06:00
Arokha Sieyes
02e490af7a VS: Implement shadekin as a legit big deal 2018-02-15 01:15:24 -06:00
Mewchild
cb01bd8db5 Ringfix 2018-02-15 00:46:57 -06:00
Mewchild
bdb99ce7dc Updates Fluff ring so gloves can be worn over it, and so it functions as a stamp (similar to normal signet ring) 2018-02-13 17:13:25 -06:00
Screemonster
c9f5d6f234 squashed commits for improved newspapering 2018-02-13 17:53:02 +00:00
Verkister
12e2385dc1 Fixes dead mobs finishing noms. 
-I thought someone would have fixed this already smh.
 2018-02-11 23:06:33 +02:00
Verkister
4be014147e Fixes belly contents showing up on screen inventory 
-Fixes prey backpack contents popping up on pred's screen after getting dumped.
-Adds an automatic closing of prey's storage for pred upon ingestion to prevent "secret backpacks"
-Also makes trash vorings use selected belly sound while at it.
 2018-02-11 14:34:55 +02:00
Aronai Sieyes
7ff0493074 Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate 
AwooCosplayCrate
 2018-02-10 23:06:35 -06:00
Silver
8c3c0430f6 Correct Origin Tech Values 2018-02-10 22:29:46 -06:00
Silver
ab40c9d38c Added Preferred Change to Deactivation Text 2018-02-10 18:26:51 -06:00
Verkister
d740ae6f90 Fixes itemweak gurgles and food misbehaving 
-Itemweak gurgles no longer add everything unconditionally to items_preserved list even if the item was digested for being food/holder/organ.
 2018-02-10 20:25:39 +02:00
Silver
ef4d87a352 AwooCosplayCrate 
Adds Wolfgirl Cosplay Crate to Supplypacks under Recreation.

Adds Wolfgirl Replica Sword and Autumn Shield.

Adds the above and three existing items to aforementioned crate.
 2018-02-08 12:57:18 -06:00
Aronai Sieyes
c0a7016d9a Merge branch 'master' into expgun2 2018-02-08 01:13:05 -05:00
Verkister
78ab5c37f4 Squashed commit of the following: 
commit 88761abcbdad12b25e4771837331ee3c40aeff19
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Feb 7 11:58:47 2018 +0200

    Some more gurgle related tweaks and fixes.
    -Removes gut transfers passing along preserved items list. (redundant with modern digest_act)
    -Adds panel update to trash eating.
    -Fixes borg sleeper gurgles causing double, maybe even triple damage due to being added into processing_objects list multiple times.
 2018-02-07 12:01:11 +02:00
Verkister
d2cb1e3011 Merge branch 'patch-8' of https://github.com/Verkister/VOREStation 2018-02-07 10:56:18 +02:00
Cyantime
d0f32b4a53 Adds frontier phaser to cargo 2018-02-06 21:58:08 -05:00
Cyantime
be7d0dd8c2 Adds expedition guns to map 2018-02-06 21:02:01 -05:00
Cyantime
12747725d9 basic weapons for the expeditions 2018-02-06 20:02:55 -05:00
Spades
dd7859ac0a Merge pull request #2978 from VOREStation/context-menu 
Removes Licking from context menu
 2018-02-05 10:13:46 -05:00
Spades
be91065e8e Licking 2018-02-05 06:43:55 -05:00
Verkister
dae786c52d Makes trash gains slightly more consistent. 
-Basically everything else is more or less 1/10 ratio between nutrition and borg cell charge and now this is too.
 2018-02-05 10:25:48 +02:00
Aronai Sieyes
bb09406ea0 Merge pull request #2934 from Verkister/yummytrash 
Trashcan perk refactor and slight expansion.
 2018-02-04 16:56:47 -05:00
Verkister
f553219bbd Squashed commit of the following: 
commit b3d348258c4c93a1df81652bdf68fd00f4130369
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 22:40:08 2018 +0200

    Squashed commit of the following:

    commit 5faa5f9d063e57400584ab1ae458e626629b6842
    Author: Verkister <superverkelian@hotmail.com>
    Date:   Sun Feb 4 22:31:10 2018 +0200

        Update pai.dm

commit fd4bbdc6b99d74d94befb440ffe5e0c23a98a918
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 11:28:58 2018 +0200

    Makes pAI cards, AI cards, and posis "edible"
    -Also makes it so that pAI cannot fold out if inside a gut.

commit 1d13c207240c4bc296b188533e8cf50b1424cc36
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Feb 4 10:40:38 2018 +0200

    some more trashcan refactoring

commit 28d02c272dbd218d2d91c91fb1ecec999b9dd05e
Author: Verkister <superverkelian@hotmail.com>
Date:   Sat Feb 3 13:32:14 2018 +0200

    Trashcan perk refactor
 2018-02-04 22:43:02 +02:00
Aronai Sieyes
566507ed76 Merge pull request #2965 from Verkister/numbflush 
Clears the prey of numbenzyme on digestion death.
 2018-02-04 15:11:10 -05:00
Aronai Sieyes
b087ff3207 Merge pull request #2929 from VOREStation/Cameron653-patch-3 
Sebastian permit & magazine update & fix
 2018-02-04 15:06:31 -05:00
Verkister
158ae3f33b Clears the prey of numbenzyme on digestion death. 
-You can now do painless gurgles without getting pumped full of your prey's painkillers at the end.
 2018-02-04 11:03:11 +02:00
Arokha Sieyes
5b1311c994 Fix NSFW and fluff item removal 
Fixes the NSFW sprite buggyness.

Removes Briana's gun spawn. She gave her gun up ICly!
 2018-02-03 21:58:41 -05:00
Aronai Sieyes
66bd426cbc Merge pull request #2913 from Verkister/patch-6 
Changes voremob default gurglemode to itemweak
 2018-02-03 20:56:37 -05:00
Cameron653
0f397452de Updates the permit, too. 2018-02-01 19:32:03 -05:00
Cameron653
45b757983a Makes Tasald spawn with the correct magazines 2018-02-01 19:27:01 -05:00
Isaac Erwin
ec20277805 Removed unnecessary 'src's, added missed cooldown 2018-01-31 20:20:43 -05:00
Verkister
7546d1fbb2 Update belly_vr.dm 2018-01-31 20:13:32 +02:00
Verkister
e6651d72b6 Makes gurgle struggle failure cycle thru itemweak 
Struggle upset the gut once to move to itemweak, fail again for full gurgles
 2018-01-31 15:03:55 +02:00
Isaac Erwin
35c4a8030e Exercise equipment changes/refactor 2018-01-31 07:30:40 -05:00
Aronai Sieyes
cdac98afc1 Merge pull request #2897 from VOREStation/aro-bstemple 
New Away Mission (and minor other stuff)
 2018-01-30 20:04:07 -05:00
Arokha Sieyes
5cda1d36c1 VS: Translocator blocked by certain turfs 2018-01-30 19:23:36 -05:00
KotetsuRedwood
d1816a3eca Adds Latex Maid Dresses. 
As the title says! Also renames clothes stuff because SS13 needs jumpsuits to end with _s for some inscrutible reason
 2018-01-29 19:47:14 +00:00
Aronai Sieyes
6e54ea70fb Merge pull request #2863 from Verkister/naster 
Nasty contamination vocabulary update.
 2018-01-28 18:18:30 -05:00
Verkister
47285cd5e3 Update contaminate_vr.dm 2018-01-28 21:10:16 +02:00
Verkister
40358bf061 Nasty contamination vocabulary update. 
-Now in even more creative flavors for digested crap!
-Also fixes a subtle blinking pixel in sludge overlay effect.
 2018-01-28 19:00:34 +02:00
Leshana
27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27 
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
 2018-01-27 23:08:53 -05:00