Commit Graph

817 Commits

Author SHA1 Message Date
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
Neerti 139d397a47 Merge pull request #3578 from Anewbe/surgical_caps
Adds surgical caps to the loadout
2017-07-23 17:42:51 -04:00
Anewbe d7875f5377 Merge pull request #3609 from Belsima/legwarmers
Adds a load of zippos to the loadout.
2017-07-18 16:27:09 -05:00
Anewbe b22a9fa575 Merge pull request #3589 from Belsima/gloves
Adds fingerless gloves.
2017-07-17 15:42:28 -05:00
Belsima a291ae9889 Adds a load of zippos to the loadout. 2017-07-17 14:57:14 -04:00
Anewbe 4e93ac107f Merge pull request #3584 from Belsima/pens
Adds a fountain pen.
2017-07-11 11:24:27 -05:00
Belsima e51de25dea Adds fingerless gloves. 2017-07-11 00:49:02 -04:00
Belsima 1d7cea9864 renames a mislabelled pen 2017-07-10 18:07:07 -04:00
Belsima b7a34a3645 Adds a gilded pen. 2017-07-10 18:01:43 -04:00
Belsima c0d22058b4 Adds a boatload of sweaters. 2017-07-10 17:49:22 -04:00
Anewbe c64f7c9fa3 Merge pull request #3505 from Dhaeleena/Somecat
Winter boots
2017-07-09 17:13:27 -05:00
Anewbe 07c82963c9 Adds surgical caps to the loadout 2017-07-09 16:18:52 -05:00
Neerti beccda6866 Makes automute less prone to mute cultists. 2017-07-04 23:20:44 -04:00
Yoshax 020c1d7d88 Adds material scanner and prescription ones to loadout 2017-06-30 23:56:44 +01: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 94522eb04f Merge pull request #3503 from MatchaFrappe/master
Adds a sexy maid uniform~!
2017-06-14 17:31:39 -05:00
Belsima 11ceb9e92f Adds snowsuits.
Also fixes department jacket access.
2017-06-08 10:02:30 -04:00
PsiOmegaDelta ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
Dhaeleena 7f773b0099 Adds Winter boots for every department! Adds said boots to the loadout. Adds boots to all the closets and wardroves that had winter jackets. Adds boots and jackets to some closets that had neither and fitted in. 2017-06-05 16:46:54 -03:00
MatchaFrappe 68310de0ae Update loadout_uniform.dm 2017-06-05 17:06:32 +10:00
Leshana b17fb86721 Tweaks Statpanel and System Initialization 2017-06-01 21:42:08 -04:00
Anewbe 1633c32c99 Merge pull request #3478 from Bromuzl/Bromuzl-High-topsLoadout
High-tops loadout
2017-05-29 13:11:57 -05:00
Bromuzl 48f668de95 Adds ported high-tops to loadout
Extends the high-top port to load-outs,
2017-05-27 04:38:15 -05:00
Schnayy b1cb74b318 Adds 4 new clothing sprites & puts them in the loadout.
Peacoats: Requested.

Black corset/skirt combo: Requested.

Flower dress: First ss13 sprite I made, threw it in.

Red swept dress: A new, nicer red dress.
2017-05-22 18:08:01 -05:00
Cerebulon 0ce6ca7290 Cleans up uniform loadout menu.
Suits are now mostly under one-piece (subtypes of 'lawyer') and modular (subtypes of 'suit_jacket') selection menus. Croptops also under selection menu.
2017-05-08 00:31:31 +01:00
Anewbe 3b82b75f83 Merge pull request #3396 from Cerebulon/skirtsuits
Adds 24 new skirt versions of suit sprites.
2017-05-05 21:55:14 -05:00
Cerebulon 36decd20b7 Adds icons. Adds skirts to loadout options and closets. 2017-04-30 02:39:27 +01:00
Cerebulon 339b269393 Adds 23 new skirt versions of existing suit sprites.
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
2017-04-29 12:01:40 +01:00
Anewbe b7751bab10 Changelog, adds the dicecup to the loadout 2017-04-17 12:44:34 -05:00
Arokha Sieyes 42998da918 Fix 'if' statement on Panic Bunker
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
2017-04-11 00:13:54 -04:00
Arokha Sieyes 66327aecc7 Quick & Dirty Panic Bunker Port
Tested on our server, works. Doesn't work if you don't have a DB (how would it?).
2017-04-11 00:13:43 -04:00
Anewbe 4a33a8df82 Merge pull request #3216 from Neerti/3/22/2017_the_empress_protects
Implements the new Codex.
2017-04-08 13:02:43 -05:00
Neerti a4a05ae4ec Implements the new Codex. 2017-04-08 12:08:08 -04:00
Anewbe e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Anewbe 6a95f6c87f Merge branch 'master' into apron_pockets 2017-04-04 17:54:38 -05:00
Anewbe b38986b4b7 Merge pull request #3209 from Atermonera/master
FBPs can have numbers in their names.
2017-04-03 13:56:06 -05:00
Atermonera 67d9f03e4d FBPs can have numbers in their names. 2017-04-02 13:53:49 -07:00
Anewbe 8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -05:00
Anewbe 29a25cc9b0 Merge pull request #3164 from Cerebulon/synth_brain_rename
Changes character setup to use correct in-lore names for brain types.
2017-04-01 16:00:19 -05:00
Anewbe 7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
Cerebulon 98d3ebf6dd Fixed full options not showing up for non-FBPs. Repeated more thorough testing with newest changes. 2017-04-01 03:09:55 +01:00
Anewbe ca47d37d2f Adds a few more cosmetic flashlights 2017-03-31 18:50:00 -05:00
Anewbe d59f0f1dc4 Merge pull request #3152 from VOREStation/aro-pol-bodymarks
Adds Body Markings
2017-03-30 20:13:15 -05:00
Anewbe 2867f17b51 Merge pull request #3162 from Schnayy/department_jackets
Adds Department Color Jackets
2017-03-30 20:11:39 -05:00
Cerebulon 2189d83812 Fixed single leftover 'cybernetic' and 'drone' variables. 2017-03-30 21:50:04 +01:00
Cerebulon 9e955cf999 Missed a spot. 2017-03-30 18:04:21 +01:00
Cerebulon 7773ef7122 Dialled back changes to only effect menu display text for brains.
Reverted variable names to original assisted/mechanical/digital to prevent potential issues in other code which may rely on them.
2017-03-30 18:01:20 +01:00
Cerebulon d5a9e15f28 Fixed get_FBP_type() method for determining min/max ages to use new type names. 2017-03-29 03:07:52 +01:00
Cerebulon dfe5afe197 Changes character setup to use correct in-lore names for brain types. 2017-03-29 01:55:46 +01:00