cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 04:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,242 Commits 9 Branches 26 Tags
daaed5921d2fe219c191b3b1675805ca4cd51bbd
Commit Graph

17471 Commits

Author SHA1 Message Date
killer653
daaed5921d Fixes conflicts 
Fixes conflicts
 2017-07-26 00:02:14 -04:00
killer653
4c4c85a742 Fixes Conflicts 2017-07-26 00:00:51 -04:00
Spades
623f5eea19 Merge pull request #1905 from Verkister/blehh 
It's the char setup update. (Wouldn't let me reopen the original PR after some explosive shenanigans)
 2017-07-25 23:34:18 -04:00
Cyantime
71112430e9 Workaround for struggle transfers 2017-07-25 16:01:09 -04:00
Verkister
3d7759ae7c Remade the file that got lost during the explosive github shenanigans. 
-Also tweaked the sergal face marking ever so slightly idk.
 2017-07-25 22:30:58 +03:00
Verkister
10e46d0b88 Merge commit '0a771ee5c1f52f467c1c07e6dc9f1b7404250efa' into blehh 
# Conflicts:
#	icons/mob/vore/tails_vr.dmi
 2017-07-25 22:05:13 +03:00
Verkister
6522105aa3 Some more stuff. 
-Added framework for custom heads using custom eyes without messing the base code.
-Slightly tweaked sergal markings.
-Added new eyes for sergals with little more snout space inbetween.
-Added teshari feathers as markings after failing to fix them for custom species.
 2017-07-25 19:27:27 +03:00
killer653
153641cabe Fixes conflict 
Fixes conflict
 2017-07-25 08:58:36 -04:00
killer653
5b2f2f811c Merge remote-tracking branch 'refs/remotes/VOREStation/master' into NATJE_CUSTOM_FLUFF 2017-07-25 08:51:43 -04:00
Verkister
3aebfd9a92 Un-conflicts fennix tail. 2017-07-25 11:52:17 +03:00
Spades
b4e00bb5c4 Merge pull request #1896 from Cameron653/ROIZ_TEST 
Adds Roiz's custom dino coat.
 2017-07-25 02:34:35 -04:00
Spades
f2b131013e Merge pull request #1894 from Cameron653/NUMB_GURGLES 
Makes everyone have numbing gurgles by default.
 2017-07-25 02:34:22 -04:00
Spades
0a771ee5c1 Merge pull request #1893 from Cameron653/KETRAI_TAIL 
Add's fennix tail for everyone to use.
 2017-07-25 02:34:11 -04:00
Cameron653
cae3af822d Update sprite_accessories_vr.dm 2017-07-24 14:33:47 -04:00
Cameron653
a5d54f1bac Removes whitespace. 2017-07-23 19:11:56 -04:00
killer653
3a5da61430 Adds Roiz's custom coat 2017-07-23 16:23:32 -04:00
killer653
fba42884be Quick design datum fix 2017-07-23 14:53:47 -04:00
killer653
7f567cf15c Gives everyone numb digestion by default 
Because why not. Healbellies are default, so why not numb belly.
 2017-07-23 12:52:58 -04:00
Cameron653
a516a0d041 Adds L and R hand sprites 2017-07-23 10:47:26 -04:00
killer653
9acf4f0b6d Adds Ketrai's custom fennix tail 
https://forum.vore-station.net/viewtopic.php?f=26&t=956&p=6110&hilit=ketrai#p6110
 2017-07-23 10:37:43 -04:00
Cameron653
2a798021dc ...This too 2017-07-21 14:39:56 -04:00
Cameron653
02ce817c44 This almost passed me by. 2017-07-21 14:39:09 -04:00
killer653
016337ee4d Quick, small fix. 2017-07-21 04:02:49 -04:00
killer653
8fbf7fc176 Adds Natje's fluff items 2017-07-21 03:02:52 -04:00
killer653
4d45cc28c3 Merge remote-tracking branch 'refs/remotes/VOREStation/master' into NATJE_CUSTOM_FLUFF 2017-07-21 03:02:39 -04:00
Leshana
ae38fb3c48 Disable all shell() exec prox for extra security. 
We do not use python or nodejs scripts. Our discord bot makes HTTP
requests.  Therefore we can entirely disable this code.  Even if we ever
want to start using these procs for discord integration, we would pipe it
through our HTTP discord proxy, not use shell().
With all instances of shell() disabled, we can't be attacked by it.
 2017-07-20 22:24:27 -04:00
Spades
0415781b54 Merge pull request #1885 from Cameron653/AUTOHISS_TRAITS 
Adds autohiss traits.
 2017-07-20 21:49:40 -04:00
Spades
849249a312 Merge pull request #1851 from Verkister/antinuke 
👌 (WOW!) ANTINUKE LOOTGURGLE UPDATE (HUGE!) 👌 (also finished)
 2017-07-20 21:47:08 -04:00
killer653
1c5d88f1fb Adds autohiss traits. 2017-07-20 10:31:39 -04:00
killer653
44a2619693 Adds their custom taur 2017-07-20 06:15:47 -04:00
Cameron653
c33a287517 Teshari was duplicated twice here. 2017-07-20 05:04:18 -04:00
Spades
bf34eaef5a Merge pull request #1869 from Cameron6531/master 
Micro step code changes.
 2017-07-20 00:45:13 -04:00
Spades
079fe0a0fb Merge pull request #1878 from Verkister/patch-1 
FIXES THE CATWALK INVENTORY BS
 2017-07-20 00:44:26 -04:00
Cyantime
875ab81824 Adds object-specific effects for running into them while confused (#1879) 
* Adds object-specific effects for running into them while confused.

* How do comments work, we just don't know

* WHAT EVEN ARE COMMENTS
 2017-07-19 15:54:41 -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
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
Spades
a04bca6da9 Merge pull request #1863 from Ketrai/patch-1 
Add approved fluff item: pink bear hat.
 2017-07-19 12:26:48 -04:00
Spades
5c57eb503d Merge pull request #1856 from Cyantime/emotes 
Fixes ghosts being unable to see any emotes
 2017-07-19 12:22:54 -04:00
Verkister
abcc7c3975 Eliminates another possible culprit for the ID bug :v 
-Gurgle drop now checks and dumps ID slot before dumping uniform pockets.
 2017-07-18 22:44:12 +03:00
Verkister
955d73d07b Should fix the double ID bug I think. 
-Seems like the code pulled an entry of the ID as the PDA's subitem.
-Moved the PDA handling part above the subitem part.
 2017-07-18 22:28:27 +03:00
Ketrai
55402f1c73 Update custom_clothes_vr.dm 2017-07-18 20:53:51 +02:00
Verkister
3e1dc9493b fixes the lattices too. 
Same thing as catwalks, your stuff shouldn't fall down from your pockets unintended.
 2017-07-18 19:46:57 +03:00
Verkister
b540e51ae9 FIXES THE CATWALK INVENTORY BS 
Things that are not on the turf floor should no longer drop through catwalks. YOU CAN NOW SAFELY BAG YOUR CRAP WITHOUT LOSING IT TO THE VOID THAT IS THE FLOOR DOWNSTAIRS.
 2017-07-18 18:32:07 +03:00
Verkister
f33c48670c fixed digested fooditems showing flavor message on human types 2017-07-18 17:49:49 +03:00
Verkister
f2df2b531c not again lmao 2017-07-18 11:09:31 +03:00
Verkister
b936f72d9a Merge branch 'master' of https://github.com/VOREStation/VOREStation into blehh 
# Conflicts:
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	icons/mob/vore/tails_vr.dmi
 2017-07-18 11:05:33 +03:00
Verkister
d0f52905c1 the commits keep coming and they don't stop coming 
-Redirected zorren species code towards the new icon file.
-Added colourable elf ears.
 2017-07-18 10:46:29 +03:00
Cyantime
f149dcf9ec Renames "second-hand NIF" to "bootleg NIF" 2017-07-18 01:58:32 -04:00
Spades
5d99c848f5 Merge pull request #1858 from killer653/master 
Adds more jackets to the loadout menu.
 2017-07-17 21:30:34 -04:00
Verkister
8cf204e325 Code snippet part for the zorren markings. 2017-07-17 23:37:16 +03:00