Commit Graph

2180 Commits

Author SHA1 Message Date
tigercat2000
732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
TheDZD
eb7b4af916 Merge pull request #4730 from Kyep/beefix
Fixes Bee Briefcase killing traitors regularly
2016-06-21 15:54:31 -04:00
Kyep
c9240f216e Changed to DZD's suggestion 2016-06-20 22:17:17 -07:00
taukausanake
fd0c0904f9 how the fuck did I miss this?
How did everyone else miss it? Thanks to Keroman for telling me something was up with the bandolier.
2016-06-20 09:38:48 -05:00
Kyep
0f96db96ba Changes Bee Briefcase to not be suicide briefcase
- Traitors attempting to open a bee briefcase without first having
injected it with their blood, will now be stopped from doing so.
Instead, they will get a message telling them how to open it safely.
- Non-traitors can still open the briefcase as normal - resulting in at
least 5 angry bees that will surely kill them.
2016-06-20 02:07:07 -07:00
monster860
3295020088 Merge branch 'master' into ui_plane 2016-06-19 12:38:00 -04:00
DaveTheHeadcrab
405a0b7d55 Defib Adjustments (#4702) 2016-06-19 07:32:30 -04:00
TheDZD
e7bdf036da Merge pull request #4698 from FreeStylaLT/grammar
Fixes some grammar mistakes, changes the \red to <span class> formatting
2016-06-16 15:14:01 -04:00
FreeStylaLT
5f4830f2fb fixed spacing 2016-06-16 22:01:42 +03:00
FreeStylaLT
3b91bec479 fixed some grammar mistakes, changes the \red to <span class>
:cl:FreeStylaLT
typo: changed its to it's in lockbox description
fix: changed \red to <span> formatting
fix: changed stetchkin's price from 9 TC to 4 TC, suppressor's from 3 TC to 1 TC
2016-06-16 21:53:33 +03:00
TheDZD
e98417590b Merge pull request #4651 from Fox-McCloud/ring
Telephone is More...Ring-y
2016-06-16 11:53:54 -04:00
Fox-McCloud
4c01733bcc phone force 2016-06-16 11:37:15 -04:00
TheDZD
dbffa27bd4 Merge pull request #4667 from Fox-McCloud/toolbox-tweak
His Grace Tweak
2016-06-16 10:27:26 -04:00
KasparoVy
86c7e6c04e Secure Briefcase now On-Par with Regular Briefcase. (#4681)
In terms of carrying capacity, flags, hitsound and attack verbs.
2016-06-16 05:17:38 -04:00
Fox-McCloud
56020099bc saner 2016-06-16 03:48:16 -04:00
TheDZD
d2b741b1e6 Merge pull request #4643 from Fox-McCloud/latex-glove-balloon
Adds in Ability to make Latex Gloves Balloons
2016-06-14 10:17:01 -04:00
Fox-McCloud
ac0d05d6cf His Grace Tweak 2016-06-14 03:42:47 -04:00
Fox-McCloud
64d5eabeac Telephone is More...Ring-y 2016-06-12 13:26:26 -04:00
Fox-McCloud
1b04261259 Adds in Ability to make Latex Gloves Balloons 2016-06-12 03:28:01 -04:00
TheDZD
92ba1ad036 Merge pull request #4621 from Fox-McCloud/hulk-stuffs
Removes Hulk+Double Energy Sword
2016-06-11 12:20:55 -04:00
pinatacolada
3566e6bc91 Defib oversights fixes (#4611)
* Defib oversights fixes

Well, ripping someone's heart out causes them to have a heart attack
right? Well, if you applied a defib to said person before they died from
said heart attack, the heart attack would be stopped, and you would now
have  a heartless living person, spooky right? This prevents that.
Also fixes defibs saying they didn't work when you applied them to
someone with a heart attack, when they in fact did work. And removed a
magic number too.

🆑 pinatacolada
fix: Fixes defibing people without a heart
fix: Fixes defib saying it didn't work stopping a heart attack when they
do
/🆑

* Update defib.dm

* slimespls

* FIXEDIT
2016-06-11 12:19:45 -04:00
TheDZD
a2f2da09b9 Merge pull request #4608 from Fox-McCloud/remove-mindslave
Can Deconvert Mindslaves and Vampire Thralls
2016-06-11 12:11:34 -04:00
TheDZD
41386dd748 Merge pull request #4551 from Fox-McCloud/chaplain-things
Ports 3 New Chaplain Weapons
2016-06-11 11:51:11 -04:00
TheDZD
818179ebc3 Merge pull request #4562 from taukausanake/belts
More belt overlays
2016-06-11 11:50:59 -04:00
SamCroswell
3664fe6b7f Quick Fix 2016-06-09 21:52:44 -04:00
Fox-McCloud
e6801a98e3 fixes and tweaks 2016-06-09 03:19:27 -04:00
Fox-McCloud
9f6dd7485d Merge remote-tracking branch 'upstream/master' into chaplain-things 2016-06-09 01:05:43 -04:00
SamCroswell
18260bff66 Prayer Beads - Merge Conflict Fix (For real this time) 2016-06-08 23:32:18 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again
Major Gun Refactor
2016-06-08 22:49:10 -04:00
Fox-McCloud
f74db988e2 Removes Hulk+Double Energy Sword 2016-06-08 02:44:41 -04:00
SamCroswell
509752f678 Spelling Fix 2016-06-07 21:59:35 -04:00
monster860
64ea452f20 Puts UI on it's own plane 2016-06-06 17:12:28 -04:00
Fox-McCloud
eb653a68c8 Can Deconvert Mindslaves 2016-06-06 10:32:57 -04:00
Fox McCloud
cad0d7ba3a Merge pull request #4607 from monster860/rnd_fix
Fix some origin_tech s
2016-06-06 07:17:54 -04:00
monster860
14a6a575a9 Fix some origin_tech's 2016-06-06 05:47:10 -04:00
SamCroswell
106743163e Prayer Beads - Fixes
The wait time is now appropriate.
Ensures you can only do one prayer at a time.
Changes messages to reflect if you're praying for yourself.
2016-06-05 17:31:02 -04:00
SamCroswell
04c7c4f843 Prayer Beads - Adds Item 2016-06-05 17:07:40 -04:00
pinatacolada
4dfbd113bc command soap books
just adds one to the blueshield's, nt rep's, IAA, captain's, and HoP's
offices. das all

🆑 pinatacolada
rscadd:Adds Command SOP books
/🆑
2016-06-04 15:49:49 +01:00
taukausanake
adc5d46920 Final push, magic belt done
This should be everything finished now. Made sprites for the wand belt and animated them too! Sprites for wand of fireball, polymorph, death, resurrection, teleportation, door creation, and nothing because it's also a wand. Also made a sprite for a single soul stone for the soul stone belt. Didn't feel it needed the same treatment as the bandolier.
The only thing that might not be accepted in this commit is that I commented out the syringe and beaker for the botany belt. They clash with the belt as it is but my argument is that they aren't even used in Hydroponics anymore anyways. At the very most you'll use them for the reagents you grow but chances are you won't put them in your belt anyways.
2016-06-03 21:52:25 -05:00
TheDZD
5c6ff25777 Merge pull request #4571 from Fox-McCloud/nullrod-fix
Fixes Nullrod Equipping
2016-06-02 20:54:45 -04:00
Fox-McCloud
99c51031f5 Fixes Nullrod Equipping 2016-06-02 20:46:49 -04:00
Fox McCloud
962002b3c9 Merge pull request #4560 from Tastyfish/item-action-button-fix
Fixes holsters and potentially other accessories's action buttons
2016-06-02 18:57:56 -04:00
taukausanake
8a717bf0e3 More belt overlays
I posted in PR #4548 that I'd like to try and make the other belt overlays. Here is my contribution!

Progress
- [x] Bandolier
- [x] Botany belt
- [ ] Utility belt
- [ ] Medical belt
- [ ] Janitor belt
- [ ] Holtser(?)
- [ ] Soulstone belt(?)

Bandolier works the same as the lazarus "trainer's belt". I had to remove the bottom shell pixels so that it actually held eight instead of nine shells.

Botany belt shows icons for plant analyzer, mini hoe, spade, hatchet, and wirecutters. Wirecutters will be shared with botany belt and utility belt.
2016-06-02 00:09:43 -05:00
Tastyfish
57abc28c73 Fixes holsters and potentially other accessories with action buttons 2016-06-01 20:30:57 -04:00
TheDZD
a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
TheDZD
95d7a68a75 Here we go again... 2016-05-31 22:50:53 -04:00
Fox-McCloud
1b830fcd1f fix 2016-05-31 22:41:07 -04:00
Fox-McCloud
bc7cee537f Ports 3 New Chaplain Weapons 2016-05-31 22:15:41 -04:00
SamCroswell
82f037d946 SecBelts 2016-05-31 17:42:14 -04:00
Fox McCloud
579e438137 Merge pull request #4537 from monster860/guest_pass
Adds some new guest pass features
2016-05-30 22:55:04 -04:00