Commit Graph

15352 Commits

Author SHA1 Message Date
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
Atermonera
ac064b0717 Fixes #2643, v2 (#2693)
* Fixes #2643, unifies list syntax within /code/modules/clothing/suits/jobs.dm

* Capitalizes "Hush" in chaplain's hoodie examine text.

* Pulls Anewbe's Sec Gear Tweak changes, should resolve the conflicts.

* Ok, now I think I did it. Forgot to add cigarettes and lighters to the forensics jacket inventory.

* Forgot a comma, thanks Yosh

* Revert fix. I'm a donk

* Properly reverts fix for #2643

* Fixes #2643

* Unifies List syntax within /code/modules/clothing/suits/jobs.dm

* Config snuck into a commit
2016-10-28 22:29:18 -05:00
Anewbe
6fd82d6d3f Adds in a var that allows species to ignore the slowdown effects of items 2016-10-28 17:02:29 -05:00
Anewbe
db64643e4f Adds another mob_size class 2016-10-27 22:41:29 -05:00
Neerti
2062083176 Merge pull request #2684 from Anewbe/varsity
Fixes the varsity jacket sprites
2016-10-26 23:17:30 -04:00
Anewbe
59d410348a Fixes Aviators blocking flash incorrectly, adds in stylish aviators 2016-10-26 21:06:51 -05:00
Anewbe
b99ebf5dde Fixes the varsity jacket sprites 2016-10-26 16:32:18 -05:00
Arokha Sieyes
4d9bb0736d Swap 'Give' dialog buttons
"Yes" on the left to be consistent with other dialogs. The number of times people (myself included) misclick because of this is impressive. Or just accidentally cancel out while typing.
2016-10-26 11:49:03 -04:00
Techhead
c344d6345f NO_POISON or IS_PLANT now grant hallucination immunity
Also stops hallucinations from preventing passing out from halloss.
Resolves #14395
Resolves #12425
2016-10-25 21:21:57 +01:00
Yoshax
11209a5b0e Tweaks path from sechud/toggle to sechud/aviator 2016-10-25 20:40:26 +01:00
Yoshax
cf35da203b Tweak the code, adds a couple of ❄️ to make it work 2016-10-25 19:18:01 +01:00
Yoshax
5a232b8837 Ports Baystation12/Baystation12#14433 2016-10-25 18:54:16 +01:00
Anewbe
b6e1b67246 Sec gear tweaks 2016-10-24 18:50:14 -05:00
Neerti
1e3a2791d6 Merge pull request #2655 from Anewbe/disarm_spam
Disarm spam is less effective
2016-10-24 19:34:07 -04:00
Neerti
7dadc5f6f9 Merge pull request #2658 from Anewbe/waistcoat
Waistcoats are accessories
2016-10-24 19:33:12 -04:00
Neerti
0bc0136f40 Merge pull request #2661 from Anewbe/shaved
Adds shaved short hair and five o'clock shadow beard
2016-10-24 19:30:58 -04:00
Neerti
6603e4c204 Merge pull request #2670 from Anewbe/spidertest
Slightly reworks the way spiders inject poison
2016-10-24 19:30:08 -04:00
Spades
18c759259b Merge pull request #680 from VOREStation/microtweak
Fix teshari spawn bug (and lack of dark overlay) and micros(?)
2016-10-23 18:25:03 -04:00