Commit Graph

21903 Commits

Author SHA1 Message Date
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
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
DaveTheHeadcrab
0c12ef1c0a Security Armor Update (#4660)
* Revert "scanner icon"

This reverts commit 86a7b5cf4f.

* Sec Armor Update
2016-06-17 11:17:56 -04: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
76ff7b48a3 Merge pull request #4633 from monster860/rnd-speed
Makes stock parts build 5x faster
2016-06-16 11:31:19 -04:00
monster860
14c340001a Desnowflakizing 2016-06-16 11:01:25 -04:00
TheDZD
dbffa27bd4 Merge pull request #4667 from Fox-McCloud/toolbox-tweak
His Grace Tweak
2016-06-16 10:27:26 -04:00
TheDZD
831ab328e5 Merge pull request #4683 from Fox-McCloud/patch-tweaks
Chem Patch Tweaks
2016-06-16 10:27:14 -04:00
TheDZD
1f2fbfcea1 Merge pull request #4673 from FreeStylaLT/stetchshitreprice
Reduces stetshit's and suppressor's prices
2016-06-16 10:26:18 -04:00
Lady-Luck
05a3c2cfdf Adds selected character below Setup Character button (#4680) 2016-06-16 05:18:07 -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
monster860
7ae3cb0bb1 Rermove "100" from the list of power options in telesci (#4671) 2016-06-16 03:47:39 -04:00
TheDZD
f40287f5b8 Knight and riot armor tweaks (#4672) 2016-06-16 03:47:20 -04:00
Fox-McCloud
4835482c53 Chem Patch Tweaks 2016-06-15 06:45:00 -04: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
KasparoVy
b45ef2da5d Dethralling a Shadowling Thrall Clears Darksight if it's Activated (#4682) 2016-06-15 05:34:41 -04:00
tigercat2000
c7bdb89454 Fix SST shuttle, make it a real shuttle (#4675) 2016-06-15 04:48:26 -04:00
FreeStylaLT
f03178c1f2 Reduces stetchist's and suppressor's prices 2016-06-15 02:58:26 +03:00
Twinmold93
674bfe5d08 No Longer Can Eat Cybernetic Implants (#4669)
This makes is so you can no longer eat cybernetic implants improperly,
just because they are in organ code. Fixes the check that originally
made it so you couldn't eat them.

🆑 Twinmold
Fix: Fixes being able to eat cybernetic implants so you cannot eat
them/force feed them to people.
/🆑
2016-06-14 17:55:40 -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
Kyep
50afa5b6a6 Clarified sentience potion message (#4646) 2016-06-13 23:11:17 -04: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
cc2766e7d7 Deathwands and googly eyes (#4653) 2016-06-13 23:07:13 -04:00
TheDZD
7372cd3820 The Ice Age (#4655) 2016-06-13 23:06:15 -04:00
Lady-Luck
608b7c2643 Removes Stealing a RCD as an objective (#4652)
* Removes Stealing a RCD as an objective.

* Fixed
2016-06-13 23:04:16 -04:00
Aurorablade
fe6c3e3626 is making a commit its looke like they are trying to commit... (#4657) 2016-06-13 23:02:30 -04:00
TheDZD
01f0738e11 Fixes camera assemblies and orange shoes not respecting NODROP (#4654)
* Fixes camera assemblies not respecting NODROP

* Shoes fix
2016-06-13 01:39:26 -04:00
Fox-McCloud
64d5eabeac Telephone is More...Ring-y 2016-06-12 13:26:26 -04:00
TheDZD
cf2e294f7c Merge pull request #4645 from LittleBigKid2000/literallyunplayable
Fixes the charcoal suit's description
2016-06-12 11:05:58 -04:00
Isaac Erwin
8c37ba7ba1 Fixes the charcoal suit's description
The tie is blue, not red. Literally unplayable.
2016-06-12 04:05:16 -04:00
Fox-McCloud
b2040467bd Fixes Databaseless Operation Runtime 2016-06-12 03:53:26 -04:00
Fox-McCloud
1b04261259 Adds in Ability to make Latex Gloves Balloons 2016-06-12 03:28:01 -04:00
Tom Heeren
4e31600491 Gives synthetics a more irritated buzz noise. (#4561)
* Adds the ability to make the sad trombone noise for synthetics.

Also moves the sound file itself into the sound/machines folder.

* No wait I can't do that

Moves the sadtrombone noise back to where it came from.

* Changes the sad trombone to buzz-two

Do I win a prize
2016-06-12 02:30:49 -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
ad0b8fea29 Merge pull request #4619 from Fox-McCloud/grab-fixup
Grab Fixes and Throwing Refactor
2016-06-11 12:29:31 -04:00
Twinmold93
bf2d74d80e Spacepod Fix - Equipment Modules (#4637)
* Spacepod Fix - Equipment Modules

Changes the installed_module variable in equipment to a list, allowing
the rest of the code to read it correctly.  Now when equipment is added
and removed from the pod, it updates properly. Also adds any equipment
the pod starts with to the list.

Fixes the issues in:
https://github.com/ParadiseSS13/Paradise/issues/4599

* Changes List Call

Changes:
equipment_system.installed_modules = new/list()
to
equipment_system.installed_modules = list()

* Properly Placement for List Defined

Removes the definition of the variable as list() from spacepod.dm to
equipment.dm, clearing up a little of size from the total code.

* Removes shot_from

Removes the shot_from lines from the code.
2016-06-11 12:22:34 -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
062f14284e Merge pull request #4547 from CrAzYPiLoT-SS13/cupcakesnchainsaws
Adds a check for twohanded items to cuffing
2016-06-11 12:11:49 -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