Commit Graph

12118 Commits

Author SHA1 Message Date
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
Twinmold93
475197ee1e Fixes Resisting Borers (#4729)
This changes the captive brain's resist connection back to resist() from
resist_borer() (an invalid verb). Makes it so you can once again resist
borers.

Reposted due to number of files adjusted from merging of conflicting
files and inconsistencies to prevent breaking other code.

🆑 Twinmold
Fix: You can once again resist borer control with the Resist verb.
/🆑
2016-06-20 03:51:47 -04:00
Tigercat2000
5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences.dm
2016-06-19 16:28:57 -07:00
FreeStylaLT
5f74dacf6a Adds duct tape, makes everything rarer, adds a new surgery bag to replace the current one, adds regular shoes and black jumpsuits 2016-06-20 01:19:06 +03: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
12314b64e7 Merge pull request #4349 from VampyrBytes/DatumEmotesMK2
Datum Emotes MK II
2016-06-19 14:04:00 -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
TheDZD
c983034b82 Merge pull request #4718 from Fox-McCloud/actual-fix
Actually Fixes Traitor-Vamp
2016-06-19 13:25:06 -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
b5316e06c8 Merge pull request #4703 from Fox-McCloud/this-pr-sucks
Makes Clonepods and Slime Processors Suck
2016-06-19 13:16:17 -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
Fox-McCloud
c04c4dcd3f steal that stuff 2016-06-19 13:04:59 -04:00
monster860
3295020088 Merge branch 'master' into ui_plane 2016-06-19 12:38:00 -04:00
TheDZD
8a8e7b8fb8 Merge pull request #4540 from CrAzYPiLoT-SS13/recyclersound
Fixes a grave mistake
2016-06-19 11:40:46 -04:00
KasparoVy
3dba1b2886 Noir Doesn't Grey out HUD, Adds Remaining Glasses for Vox, 'Yi' to Vox-pidgin syllables & Framework for Icon-based Skin Tone, Fixes #3138, Greyscales Vox Hair (#4614)
* Ports #9294 and #9322 from VG: 'Yi' to Vox-pidgin and Framework for Icon-based Skin Tone (Feat. Vox) and Glasses/Goggles for Vox.

Both ported PRs by Intigracy.

Also adds all remaining in-use glasses/goggle sprites for Vox. I cleaned up the code a bit while I was in there. Otherwise, that's it.

Furthermore, randomizing skin tone doesn't seem to work for Vox despite their being specified in the conditional lists and s_tone being not null.

* Morph Support

* CMA Support

* Ports Intigracy's vgstation13/pull/9460, Noir Vision No Longer Greys Out HUD.

* Fixes Positioning of Vox Jensen Shades East+West facing Sprites.

Fixes Heist Goofery

Game-mode (not one-click antag) Heist tweaked and returned to working order now that I've found out how to test the actual game-mode (after temporarily adjusting the population requirement).

Vox Raiders won't spawn in with whatever socks were in their selected spawn-character's preferences anymore.

Additionally, the set_species proc now zeroes out skin tone if the species doesn't have skin tone to avoid goofing up the icons on initial generation.

Also condenses the code in preferences_setup character creation icon generation. Made it use the individual species' skin-tone handling procs instead of code snowflaked into preferences_setup.dm.

* No More Vox Tail Colours, but they can Colour Their Hair.

* Removes unneeded 'src's and retroactively prohibits colouring tails on species without HAS_SKIN_COLOR.

Colouration won't be applied to src's tail unless HAS_SKIN_COLOR is in
src's species bodyflags.

* Tidies up some Lists in CharPrefs and Retroactively Prohibits Vox Hair Colouration

* Reverts unnecessary commenting out of vox armalis post-spawn handling parent call.

* Adds Emerald and Azure Vox Skin Tones.

* Stealthy Wryn Typo Fixed.

* Greyscales Vox Head+Facial Hair and Adds More Default Colours in Species Definitions

* Gives Vox Raiders Default Hair Colour and Fixes Bug where Roundstart Raiders don't get Random Skin
2016-06-19 11:35:36 -04:00
Fox-McCloud
69272e9430 tweaks 2016-06-19 09:30:32 -04:00
Fox-McCloud
3dd9a714fc Actually Fixes Traitor-Vamp 2016-06-19 09:05:13 -04:00
Twinmold93
87f5ea053e Syndicate Bomb Timer Adjustment (#4710)
This makes it so the Syndicate Bomb and all subgroups of it reflect a
more accurate time remaining on the bomb. Instead of having a minimum of
60, counting down 1 per 2 seconds, it has a minimum of 120, counting
down 2 per 2 seconds. Adjusts the timer point when it starts beeping
louder to reflect this change, so it matches the current amount.

🆑 Twinmold
Tweak: Makes Syndicate Bombs show a more accurate time remaining until
detonation.
/🆑
2016-06-19 07:35:53 -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
taukausanake
eec29a3e9c I DID IT
Finally got the HUDs to work all thanks to Crazylemon. The only thing that doesn't work is the hudharvest2 is_type_in_list() check I made but I could get rid of it
2016-06-18 18:10:31 -05:00
monster860
b409fac72f Removes "src." from RCD code 2016-06-18 18:04:21 -04:00
Fox-McCloud
096ae44e07 Makes Clonepods and Slime Processors Suck 2016-06-17 12:42:44 -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
FreeStylaLT
950b718551 adds extended oxygen tank to list, also fixed indentation in last commit I think 2016-06-17 16:56:07 +03:00
Twinmold93
434cce64ec Adjustments to Revenant Abilities (Nerf) (#4693)
Changes some variables in Revenant abilities. Not as extreme as
suggested by some people, but definitely a nerf to Revenants.

This change lowers the amount of confusion from Revenants from 50 to 20
per use of Defile.  This also adds in a maximum confusion of 30 that
Defile can give someone. Finally, this lowers the range of malfunction
from 4 tiles to 2 tiles, as it still uses an EMP function which makes it
an instant kill against IPCs, and greatly incapacitating anyone with
mechanical organs (especially heart).

The numbers for confusion also come out to about equal seconds.

🆑 Twinmold
Tweak: Lowers the range of Malfunction from 4 tiles to 2 tiles, due to
ability to insta-kill IPCs/incapacitate those with mechanical hearts.
Tweak: Lowers amount of confusion given from Revenants from 50 to 20 per
Defile.
Fix: Sets a maximum confused amount from the Revenant's Defile ability
(now 30).
/🆑
2016-06-17 05:44:34 -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
FreeStylaLT
bbb9465108 removes stimulants (oops) adds syndicards, regular brown shoes and syndicate briefcase to loot drop list (double oops) 2016-06-16 05:00:28 +03:00
FreeStylaLT
e712baf111 removed thermals, binary key and adrenal implants from the list 2016-06-16 04:26:51 +03:00
taukausanake
e9d9a4c345 Mistakes were made 2016-06-15 19:11:49 -05:00
Fox-McCloud
b89364e1df Gives Warden Krav Maga Gloves 2016-06-15 17:15:58 -04:00
FreeStylaLT
9e95dfcd17 added the actual items to the list 2016-06-16 00:09:13 +03:00
LittleBigKid2000
7d5d29d610 Rewords various objectives and makes 'Follow the inviolate' always succeed (#4648)
* Rewords various objectives, makes 'Follow the inviolate' always succeed.

* Fixes the capitalization of NanoTrasen

* Fixes inviolate objective so that admins can make it fail, hopefully

* Fixes the thing

* Re-reworded AI hijack objective
2016-06-15 06:32:45 -04:00
tigercat2000
c7bdb89454 Fix SST shuttle, make it a real shuttle (#4675) 2016-06-15 04:48:26 -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
VampyrBytes
7979706c5a strips out old emote code 2016-06-14 09:03:39 +01:00
Fox-McCloud
ac0d05d6cf His Grace Tweak 2016-06-14 03:42:47 -04:00
Tigercat2000
599527a480 Add skirts to wardrobe lockers. 2016-06-13 21:13:10 -07:00
Tigercat2000
d5ae124a92 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi
2016-06-13 20:11:29 -07:00
LittleBigKid2000
1a19b25c95 Removes dust from vox raider base (#4649)
* Is removes dusts from voxxy base

🆑 LittleBigKid2000
Fix: The vox raider's base is now filled with nitrogen instead of
regular dusty air.
/🆑

* Now with 100% less varediting to change air contents
2016-06-13 23:11:03 -04:00
TheDZD
7372cd3820 The Ice Age (#4655) 2016-06-13 23:06:15 -04:00