Commit Graph

5557 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
5e2d7920c7 Merge pull request #4713 from DaveTheHeadcrab/engineer_workboots
Engineer Workboots
2016-06-22 14:03:04 -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
TheDZD
931f25c5f4 Makes it so lockers are no longer a safe place to hide from Lord Teslaloth (#4704) 2016-06-19 14:28:08 -04:00
TheDZD
36aaa78b76 Merge pull request #4610 from monster860/ui_plane
Puts UI on it's own plane
2016-06-19 13:38:01 -04:00
FalseIncarnate
ae70a7fc69 Bug Fixes (#4714)
* Bug Fixes

Fixes #4616
- All ladders are now anchored and cannot be dragged, including dive
points.

Fixes #4663
- Trying to fill a full container from a toilet will inform you the
container is full, and thus fail.

Fixes #4705
- Being gibbed/dusted/melted will unbuckle the victim prior to their
gruesome fate, allowing their spirit freedom to no longer haunt the
buckles that bound their mortal form.

* Because apparently we shouldn't trust people to use "delete" properly
2016-06-19 13:24:58 -04:00
TheDZD
4df4b58bc1 Merge pull request #4687 from Fox-McCloud/crouching-warden-hidden-greytide
Gives Warden Krav Maga Gloves
2016-06-19 13:13:11 -04: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
SamCroswell
cbcf30335f Boots for Atmos Techs! 2016-06-18 22:17:16 -04:00
SamCroswell
3e25608535 Engineer Workboots 2016-06-18 22:08:59 -04:00
DaveTheHeadcrab
0c12ef1c0a Security Armor Update (#4660)
* Revert "scanner icon"

This reverts commit 86a7b5cf4f.

* Sec Armor Update
2016-06-17 11:17:56 -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
Fox-McCloud
b89364e1df Gives Warden Krav Maga Gloves 2016-06-15 17:15:58 -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
monster860
42639bcab5 Traders Event (#4016)
* Traders Event

* lien notes

* Fixes indent

* Gets rid of things Fox doesn't like.

* how did that get deleted

* Get rid of things maintainers don't like

* Adds some crates to the shuttle, and a recall console to the base.

* EVENT_LEVEL_MAJOR, and make it weight 0 (out of rotation)

* line nutes
2016-06-11 12:47:20 -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
d1f017e684 Merge pull request #4595 from FreeStylaLT/HEAD
Adds Mind Batterer, an AOE Crowd Control Traitor-only device.
2016-06-11 12:06:59 -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
TheDZD
de7bf10447 Merge pull request #4620 from Fox-McCloud/mai-tables
Nerfs Tabling
2016-06-11 11:47:20 -04:00
Fox McCloud
0d627d3213 Merge pull request #4629 from DaveTheHeadcrab/chaplain_stuff
Prayer Bead Fix
2016-06-09 23:49:21 -04:00
SamCroswell
3664fe6b7f Quick Fix 2016-06-09 21:52:44 -04:00
Fox McCloud
7f099b4b75 Merge pull request #4625 from Krausus/PoliceTapeBumpFix
Fixes Tape Moving Mobs Recklessly
2016-06-09 03:50:46 -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
Krausus
3c7ab29e2e Fixes police tape moving mobs recklessly 2016-06-09 01:01:03 -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
TheDZD
16f4b61520 Merge pull request #4613 from Fox-McCloud/experimentssss
Experimentor Duplication Limit
2016-06-08 11:15:18 -04:00
Fox-McCloud
f74db988e2 Removes Hulk+Double Energy Sword 2016-06-08 02:44:41 -04:00
Fox-McCloud
4fa4b253ef Nerfs Tabling 2016-06-08 02:14:06 -04:00
SamCroswell
509752f678 Spelling Fix 2016-06-07 21:59:35 -04:00
FreeStylaLT
2febf8ae60 Reduced range to not affect off-screen dudes and dudettes 2016-06-07 15:07:10 +03:00
FreeStylaLT
692aa38d4e Changed from orange to oview 2016-06-07 14:46:20 +03:00