Commit Graph

2190 Commits

Author SHA1 Message Date
Kyep
d28cb5e8bc Allows admins to save their CC characters (#4717)
* Initial Checkin

- Creates two new admin-only jobs, "Nanotrasen Navy Officer", and
"Special Operations Officer". The former is for IC investigations by
admins of situations on the Cyberiad, and spawns in the admin room. The
latter is for leading/overwatching ERT teams, and spawns at the ERT
office.
- Neither of these jobs are accessible to normal players, either on
join, in preferences, or as a random job.
- When they are spawned, no announcement is made, and they do not show
up on the crew manifest.
- In other news, the "select equipment" debug verb has also been
adjusted so that NT Navy Officers get the same equipment either way.

* Fixes teleporter on admin station so that admins can use it to teleport directly to bridge

* Fixes CC jobs not always displaying CC HUD icon for sechuds

* Adds an implant that dusts someone on their death

* Tweaks

Changes:
- CC officers now spawn with an internals box in their backpacks, like
everyone else.
- CC officers now get dust and death alarm implanters in their backpacks
on spawn, rather than automatically having the implants in their bodies.
This enables admins to test things on admin station without worrying
about dusting or having their deaths broadcast.
- Dust implants no longer provide death alarm functionality.
- Dust implants no longer process().
- Dust implants are now based on explosive implants, and can be manually
activated via deathgasp.
- CC officers now spawn with CC headsets that are named 'centcom
headset'.

* Deletes CC encryption key

* Switches to using imp_in.dust()
2016-06-26 13:57:59 -04:00
Krausus
eecf8ba93b to_chat fixes
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
2016-06-24 18:36:50 -04:00
TheDZD
c626530c5e Merge pull request #4638 from monster860/rcd-ui
Gives RCD a UI, and the ability to select airlock type and access
2016-06-24 08:53:49 -04:00
monster860
677ba508a7 Forgot a thing 2016-06-23 20:03:26 -04:00
monster860
c048af99f0 Access restrictions on RCD door access changing 2016-06-23 20:01:29 -04:00
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
monster860
b409fac72f Removes "src." from RCD code 2016-06-18 18:04:21 -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
monster860
6fc572f5cc Readds sparks, removes commented code. 2016-06-13 11:37:34 -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
4ad0437b58 gives rcd a ui, and ability to select airlock type and access 2016-06-11 20:06:09 -04:00
monster860
f227091d50 Basic shit for rcd ui 2016-06-11 12:37:58 -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
monster860
da65415308 Removes relative pathing 2016-06-11 12:11:22 -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