Commit Graph

1690 Commits

Author SHA1 Message Date
Belsima
fb0e4d3cf9 General uniform updates. (#3814)
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671d.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
Belsima
c5651146fe Adds an icon state for SWAT gloves. (#3832) 2017-09-15 16:58:47 -05:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Spades
5bbf24a386 Fixes "Death Commando" mask, changes its name
No use letting unused assets go to waste.

At first I thought this was a redundant mask but it actually serves a
use, it's just coded wrongly.
2017-09-01 20:09:31 -04:00
Anewbe
4745ce0aa4 Merge pull request #3706 from SpadesNeil/removes-hardsuit-lettering
Removes hardsuit descriptions that name the station.
2017-08-22 17:17:25 -04:00
Anewbe
3650fb1562 Merge pull request #3699 from Belsima/master
A load of Teshari stuff: For Real This Time
2017-08-16 22:53:00 -04:00
Spades
b8cb57612c Removes hardsuit letters that name the station.
Do I really need to explain why it's dumb for this to appear on Syndie
suits, or NASA suits, or CentCom suits, or any other suits that don't
explicitly belong to the station?
2017-08-12 02:55:56 -04:00
Belsima
d4e3b4453d A load of Teshari stuff: For Real This time 2017-08-10 16:12:16 -04:00
Spades
ff3396c4fb Fixes capitalization of goggles and glasses
The improper grammar annoyed me.
2017-08-07 22:17:07 -04:00
Anewbe
1a7d47fc6b Merge pull request #3676 from Neerti/8/3/2017_tool_update
Updates Tools
2017-08-04 14:05:06 -05:00
Neerti
1008cd7250 Merge pull request #3671 from Anewbe/gloves
Redoes how gloves prevent fingerprints
2017-08-03 20:55:48 -04:00
Neerti
99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
Anewbe
7cb26893e1 Redoes how gloves prevent fingerprints 2017-07-31 19:06:22 -05:00
Anewbe
fdfec79e6c Tweaks prometheans 2017-07-29 20:14:20 -05:00
MagmaRam
91928e4cf8 Merge pull request #3658 from Cyantime/flatcap
Fixes the colorable flatcap in loadout having no icon
2017-07-28 15:17:19 -05:00
Cyantime
bf60030b6b Fixes loadout flat cap having no icon 2017-07-27 23:25:28 -04:00
Cameron653
97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
Anewbe
824cab5270 Merge pull request #3621 from Cameron653/master
Makes sure female executive suit has different name
2017-07-24 12:37:29 -05:00
MagmaRam
9055ac6e1e Merge pull request #3600 from Anewbe/scrubs
Gives medical scrubs sleeves, that can be rolled down.
2017-07-23 11:34:21 -05:00
Cameron653
5356b54b60 Update miscellaneous.dm 2017-07-22 21:49:23 -04:00
Spades
7e4417d31f It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
2017-07-21 04:29:39 -04:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Anewbe
b22a9fa575 Merge pull request #3589 from Belsima/gloves
Adds fingerless gloves.
2017-07-17 15:42:28 -05:00
Anewbe
b220cf3c2f Merge pull request #3597 from PrismaticGynoid/intellicores
Replaces intelliCards with intelliCores.
2017-07-15 14:48:36 -05:00
Anewbe
9ad0ea0189 Gives medical scrubs sleeves, that can be rolled down. 2017-07-13 18:39:47 -05:00
PrismaticGynoid
ad6e395ae2 Replaces intelliCards with intelliCores.
Sprites replaced with a black box that could conceivably contain a brain, while obscuring the details. Complete with screen and convenient handle.
Usage text modified to make sense for MMIs/posibrains, instead of just drone brains (e.g. downloaded → transferred).
Description added to the new intelliCores. Made into normal-sized item, similar to MMIs/posibrains.

This is an alternative to either changing lore to allow for brain uploading, or changing code to allow for choosing multiple AI brain types.
2017-07-13 00:14:34 -07:00
Anewbe
8bac0c6a64 Merge pull request #3582 from Anewbe/sleeves_flannel
Rolling sleeves on flannel shirts now uncovers your arms
2017-07-12 23:18:21 -05:00
Anewbe
3648aa0348 Tweaks Hawaiian shirts and sweaters 2017-07-11 14:39:44 -05:00
Anewbe
760a4da4af Merge pull request #3583 from Belsima/sweaters
Adds a boatload of sweaters.
2017-07-11 11:24:15 -05:00
Belsima
b3ca1ca844 nevermind, we removed species restrictions 2017-07-11 00:56:17 -04:00
Belsima
5ef4fd26ca snip snip
Cuts off the fingers of the fingerless gloves. Oops.
2017-07-11 00:54:16 -04:00
Belsima
e51de25dea Adds fingerless gloves. 2017-07-11 00:49:02 -04:00
Belsima
1afadcabfc removes BAD comment 2017-07-10 17:51:16 -04:00
Belsima
c0d22058b4 Adds a boatload of sweaters. 2017-07-10 17:49:22 -04:00
Neerti
a47584fdb0 Merge pull request #3576 from Anewbe/medical_gowns
Adds medical gowns
2017-07-10 17:48:31 -04:00
Anewbe
da004981e6 Rolling sleeves on flannel shirts now uncovers your arms 2017-07-10 16:44:57 -05:00
Anewbe
4f1760689d Fixes a typo 2017-07-09 17:18:36 -05:00
Anewbe
c64f7c9fa3 Merge pull request #3505 from Dhaeleena/Somecat
Winter boots
2017-07-09 17:13:27 -05:00
Anewbe
252f3af8ad Adds medical gowns 2017-07-09 15:03:11 -05:00
Belsima
132f548c3a Adds a striped swimsuit. 2017-07-07 13:13:50 -04:00
Yoshax
020c1d7d88 Adds material scanner and prescription ones to loadout 2017-06-30 23:56:44 +01:00
Anewbe
b3f294efd2 Merge pull request #3523 from Yoshax/whythehellisthislikethisandwhydidnobodymentionitbefore
Nerfs the siemens on most hardsuits
2017-06-25 16:30:06 -05:00
Anewbe
81e7d9ce42 Merge pull request #3513 from Belsima/snowsuit
Adds snowsuits.
2017-06-25 16:27:43 -05:00
Belsima
a62c91ebd3 Appeases the mergelords. 2017-06-16 20:27:08 -04:00
Anewbe
7cb81853a4 Merge pull request #3529 from VOREStation/qdel-hints-gen-3
Qdel Hints Round III
2017-06-16 16:17:33 -05:00
Anewbe
d8c06c0b34 Merge pull request #3514 from Yoshax/rigsuit
Makes the CEs hardsuit and Engineering hardsuit temperature resistant
2017-06-15 20:26:57 -05:00
Anewbe
94522eb04f Merge pull request #3503 from MatchaFrappe/master
Adds a sexy maid uniform~!
2017-06-14 17:31:39 -05:00
Leshana
4b46703d9d A plethora of Destroy() fixes - return qdel hints and clean stuff up. 2017-06-14 01:07:35 -04:00
Yoshax
b345201009 Nerfs the siemens on most hardsuits 2017-06-11 02:27:12 +01:00