cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 05:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,475 Commits 9 Branches 26 Tags
49e945afb7ac656d81a935a2a0e7f87261afcfa2
Commit Graph

19737 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
f3acd961d3 POLARIS: Walking with nonshoes on feet causes runtimes 2018-02-15 21:44:59 -06: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
2fbbf52f40 Merge pull request #2974 from Cyantime/nobinoc 
Removes binoculars from xenoarch lockers
 2018-02-15 18:16:14 -06:00
Aronai Sieyes
b95d2656a9 Merge pull request #3041 from VOREStation/aro-2810 
Prevents respirocytes from flooding rooms with O2
 2018-02-15 18:05:30 -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
ab7ca34d37 Merge pull request #3034 from VOREStation/aro-3028 
Moves the 'Toggle Agility' verb into Abilities
 2018-02-15 18:05:01 -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
Aronai Sieyes
f042649448 Merge pull request #3030 from VOREStation/vplk-lightswitches 
Make light switches constructable
 2018-02-15 17:58:20 -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
cf7754a55a Fixes #2810 2018-02-15 03:42:49 -06: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
90446ec502 Fixes #3028 2018-02-15 02:37:15 -06:00
Mewchild
cb01bd8db5 Ringfix 2018-02-15 00:46:57 -06:00
Leshana
b4b9cea362 Make light switches constructable 
Adds constructable light switches using Brown's construction stage icons.
 2018-02-14 21:26:00 -05: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
Aronai Sieyes
3902093a31 Merge pull request #2991 from Haery70/master 
Haery70 - adds Cookiegirl mobs
 2018-02-11 14:53:20 -06:00
Aronai Sieyes
bee05d5fc4 Merge pull request #3015 from Verkister/bummerspace 
Fixes belly contents showing up on screen inventory
 2018-02-11 14:49:18 -06:00
Aronai Sieyes
979eac5a48 Merge pull request #3004 from Screemonster/ivegotmyionyou 
Ion gun / EMP bugfix and refactor
 2018-02-11 14:48:51 -06: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
Screemonster
2cd47f9c80 squashed commits - ion pistol refactor and away mission emp nerf 2018-02-11 09:27:40 +00:00
Aronai Sieyes
7ff0493074 Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate 
AwooCosplayCrate
 2018-02-10 23:06:35 -06:00
Aronai Sieyes
526e886a21 Merge pull request #2994 from Verkister/badboi 
Adds a fancy new voremob.
 2018-02-10 23:04:47 -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
519adc1c3e Update badboi.dm 2018-02-10 23:36:24 +02: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
Verkister
d240032910 some changes 2018-02-08 10:57:45 +02:00
Verkister
7afc963393 Adds a fancy new voremob. 
-"corrupt hound". Basically a messed up evil feral borgo.
-Currently only available without bus shenanigans through the dangerous pred crate. Could be added to some expeditions and such I guess.
-Loot drops illegal borg upgrade module.
 2018-02-08 10:11:42 +02:00
Aronai Sieyes
c0a7016d9a Merge branch 'master' into expgun2 2018-02-08 01:13:05 -05:00
Haery70
543574dbfd Update cookiegirl.dm 2018-02-07 23:59:07 -05:00
Haery70
5bcdd2b707 Update cookiegirl.dm 
Editing a part on the examine text regarding the nipples. No need for that.
 2018-02-07 23:57:02 -05:00
Haery70
66fbb3d485 Add files via upload 2018-02-07 23:21:18 -05:00
Aronai Sieyes
999597dad1 Merge branch 'master' into polaris-sync-2018-02-07 2018-02-07 23:06:03 -05:00
Aronai Sieyes
0a415d0047 Merge pull request #2988 from VOREStation/aro-aerostat 
Exploration Update #3
 2018-02-07 22:22:01 -05:00
Leshana
a8c7c520bb VOREStation updates related to merged changes from polaris. 2018-02-07 20:08:10 -05:00
Arokha Sieyes
c871e617db VS: Swap two things to ion pistol rather than rifle 2018-02-07 20:03:44 -05:00
Arokha Sieyes
fb62a2fe45 VS: Two mob tweaks to make them better 
Syndicate and hivebot
 2018-02-07 20:03:41 -05:00
Arokha Sieyes
c493b83531 VS: Simple_animals avoid my custom sky too 2018-02-07 20:03:41 -05:00
Arokha Sieyes
8684fcf4eb POLARIS: Allow simple_animal to avoid turfs 
Like the sky. TODO: Lava??
 2018-02-07 20:03:41 -05:00
Arokha Sieyes
54b6e9de7d VS: Fix a totally unrelated qdel gc bug with a planemaster 2018-02-07 20:03:40 -05:00
Arokha Sieyes
deef737212 POLARIS: New mob var 'low_priority' for skipping life() 
Mobs with this will not have life() called on them unless there's a non-observing player on the same z-level.
 2018-02-07 20:03:40 -05:00
Arokha Sieyes
1496a17e63 VS: Adds two mobs: shadekin, jelly 
Shadekin is WIP for now, can be used for events. Jelly is on Virgo 2.
 2018-02-07 20:03:39 -05:00