cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 12:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,481 Commits 8 Branches 26 Tags
fa5df25a604d7b06084dfc345f85973e960c2eab
Commit Graph

15369 Commits

Author SHA1 Message Date
killer653
fa5df25a60 Adds mega/shrink shrooms to vendors 2016-12-04 21:07:53 -05:00
Cameron653
8a12de6ed2 Create seed_pacets_vr.dm 2016-12-04 20:01:31 -05:00
Spades
8c9c0803fe Merge pull request #727 from Cameron653/master 
Modifies ERT dogborg disabler & minor bugfixes
 2016-12-04 13:46:16 -05:00
Spades
22006dc34f Merge pull request #733 from Screemonster/feralmonsterness 
Xenochimera bugfix and feralness overhaul
 2016-12-04 13:45:37 -05:00
killer653
f79da03905 Minor text fixes 2016-12-02 17:43:42 -05:00
killer653
81687384cf Makes it so mobs aren't given reagent lists. 
Should fix #732

This time put on the correct account for testing
 2016-12-02 16:34:15 -05:00
Cameron653
c4d085559f Reverts an accident. 
The fix for absorption was supposed to stay in my desktop github until i was done
 2016-12-02 15:42:48 -05:00
Screemonster
31c1c29ba3 two-period ellipses are my fucking bane 2016-12-02 04:23:00 +00:00
Cameron653
d6f3caa2ac Makes it so mobs aren't given reagent lists. 
Should fix #732
 2016-12-01 22:14:07 -05:00
Screemonster
d6a0f858c0 Makes xenochimera go feral in response to pain 2016-12-01 23:28:42 +00:00
Cameron653
6c38e76f98 Makes disabler 1 shot stun 2016-11-28 14:18:06 -05:00
Cameron653
236769651c Update dog_modules_vr.dm 2016-11-28 14:17:12 -05:00
Spades
fd6587567a Fixes Catgirls, fixes Carp 
Both had broken sprites. Now they aren't broken.
 2016-11-27 23:49:37 -05:00
Cameron653
f5deb57014 Fixes a fluff item so it isn't bugged 2016-11-20 00:51:24 -05:00
Cameron653
b459ae11e3 Quick bugfix since wolf taur armor wasn't showing up. 2016-11-20 00:46:16 -05:00
Cameron653
c157b758e2 Gives the gun 10 shots 
Because an emergency borg should have more shots than a normal security borg.
 2016-11-19 21:33:31 -05:00
Cameron653
1b27ade2f9 Makes beam emit cyan light since cyan beam 
Because cyan beam emitting white light is weird.
 2016-11-19 12:27:54 -05:00
killer653
7197834863 Adds in an ERT borg 2016-11-18 22:59:47 -05:00
Cameron653
9135a5d426 Update tools_vr.dm 2016-11-13 20:05:04 -05:00
Cameron653
f52dc07139 Create tools_vr.dm 2016-11-13 19:54:02 -05:00
Cameron653
7afa52d925 Update tools_pickaxe_vr.dm 2016-11-13 19:44:52 -05:00
Spades
56cafd3e01 Merge pull request #716 from Cameron653/master 
Fixes taursuits for real this time.
 2016-11-09 20:03:44 -05:00
Cameron653
492b3a9d23 Update armor_vr.dm 2016-11-09 16:21:24 -05:00
Cameron653
6140d1234d Fixes taursuits? 2016-11-09 16:19:55 -05:00
Spades
1c4a0cefc9 Merge pull request #715 from VOREStation/screepr 
Fix Scree's fluff item issue
 2016-11-09 15:19:56 -05:00
Arokha Sieyes
78014b957c Merge pull request #709 from Cameron653/master 
Enables SilencedMP5A5's custom items. Taursuit bugfix.
 2016-11-09 12:29:04 -05:00
Arokha Sieyes
8060a265da Fix Scree's fluff item issue 
I couldn't update his PR so I did my own. It turns out that the if(..()) thing is how all the other can_mob_equip things handle their calls to ..() so we'll just do that too. Also I named my things backwards, derp.
 2016-11-09 12:22:59 -05:00
Cameron653
f2df54c60b Fixes taur armor 
I hate using the github website since it creates a mass of commits, but this isn't a big enough change to open it all up in github.
 2016-11-08 14:16:18 -05:00
Cameron653
a868a7f679 Fixes taursuits while I'm at it 2016-11-08 14:14:31 -05:00
Cameron653
371be00963 Update custom_items_vr.dm 2016-11-08 14:11:19 -05:00
Cameron653
cbec44928b Fixes all the problems. Hopefully ..() works 
Going to test this real quick
 2016-11-08 14:08:02 -05:00
Cameron653
f2bb3989d5 Adds 2016-11-07 20:35:04 -05:00
Screemonster
14f64dd876 Custom items for Jemli 2016-11-07 03:57:21 +00:00
Cameron653
76e798cddc Update custom_items_vr.dm 2016-11-06 21:29:58 -05:00
Spades
e126d5b11d Merge pull request #705 from VOREStation/discord-integration 
Discord integration
 2016-11-06 12:11:18 -05:00
JoanRisu
c4a0a306b1 Thanks, Travis 2016-11-05 07:26:19 -07:00
JoanRisu
25533ab015 Added a bunch of items. 
+Adds Octavious suit, coat, cane, bowler hat, and mask
+Adds new .357 flash, rubber, stun ammunition.
~Changes Tasald's .38 SA to .357 SA because the SA code isn't broken anymore. Permit changed to reflect this. Also changes default ammo to rubber.
+Jacob Dragon's Earthen Breath items
~Added the following already in-game items to the spawn list:
+Serkii's bunny slippers
+Killjaden's character Lassara's Knife Harness
+SilverTalismen's character Tasy Ruffle's sexy clown stuff
+Viveret's character Silentio sexy mime stuff

+Added sprites for:
+Zaeperry99's character Lexi's Prayer mat
+Viveret's character We-B's holopen
 2016-11-05 07:10:15 -07:00
Leshana
6b26f620c2 Add discord integration for faxes 
* Transmit a message to a webhook that sends a message to discord when an admin fax is sent.
* Its not feasible to send the text of the fax (considering it might be just a picture!) to discord, so instead we export it to a file, and discord links back to it.
* Obviously to fully work this also requires a webhook script and webhosting of the faxes folder.
 2016-11-04 21:58:25 -04:00
Leshana
8710e0f926 Fix faxes color coding by destination actually working. 
* This was probalby once a switch and broken by whoever put in the boss_name thing.  But yeah, obviously this code won't work as is, so lets fix it.
 2016-11-04 21:58:25 -04:00
Arokha Sieyes
cb4d63879f Travis doesn't understand COMMENTS I guess 2016-11-04 16:12:09 -04:00
Arokha Sieyes
d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
 2016-11-04 15:42:32 -04:00
Arokha Sieyes
9c47d2d7e7 Merge pull request #701 from VOREStation/synthsprites 
FBP/Synth wound sprite updater
 2016-11-04 15:36:13 -04:00
Arokha Sieyes
919c5f1962 Merge pull request #691 from VOREStation/itemswap 
Swap 'Give' dialog buttons
 2016-11-04 15:32:28 -04:00
Arokha Sieyes
1be4d0a019 FBP/Synth wound sprite updater 
It returned before it got to the bottom with robotic limb repair, which would leave the wound sprites on them unless an admin forced an icon update on them. So now we update them just like we do for organics a few lines below when wound levels change.
 2016-11-04 14:24:15 -04:00
Anewbe
2ca61948a5 Merge pull request #2692 from Anewbe/slowdown_fixed 
Species var to ignore the effects of item slowdown
 2016-11-02 16:30:01 -05:00
Anewbe
eb7aae0a96 Merge pull request #2690 from Anewbe/huge_mob 
Adds another mob_size class
 2016-11-02 16:29:44 -05:00
Anewbe
f16e515cf7 Merge pull request #2697 from VOREStation/barking 
Adds "Intercom Msg" admin verb
 2016-11-01 22:06:23 -05:00
Arokha Sieyes
e3e8ca61c0 Adds "Intercom Msg" admin verb 
Allows an admin to fabricate radio messages, like the arrivals announcements, but with arbitrary sender and message content, as well as being on any channel.
 2016-11-01 19:56:31 -04:00
Spades
24fa7d761c Merge pull request #667 from Cameron653/master 
Makes Diona a whitelisted race
 2016-10-30 17:39:53 -04:00
Anewbe
da77d7d511 Merge pull request #2682 from Yoshax/danktreememes420swagit 
NO_POISON or IS_PLANT now grant hallucination immunity
 2016-10-29 21:20:23 -05:00