Commit Graph

312 Commits

Author SHA1 Message Date
Zuhayr 0091aca22c Merge with dev. 2015-02-04 11:05:35 +10:30
Chinsky 848d1cddd5 Merge pull request #7591 from mwerezak/custom-item
Adds blue suit jacket to custom loadout gear
2015-02-03 18:09:44 +03:00
Chinsky 81e40aa542 Merge pull request #7794 from sabiram/dev
Adds approved custom item to common loadout pool
2015-02-03 18:09:32 +03:00
SkyMarshal 8898689c5d Cleared out my WIP folder. 2015-02-03 03:20:42 -07:00
sabiram 9497afa402 Recoloured spite 2015-01-26 18:40:13 -05:00
mwerezak aeec54aece Fixes bad gear datum paths 2015-01-12 00:19:01 -05:00
sabiram 66ab6bffba Adds my approved custom item (baystation12.net/forums/viewtopic.php?p=255276) to the common loadout pool. 2015-01-10 22:55:29 -05:00
Zuhayr e07a14c0ea Made bomber jacket/hoodies toggleable, added black hoodie. 2015-01-06 01:35:45 +10:30
Zuhayr a41364fbd1 Fixes #7595 2015-01-02 00:00:23 +10:30
mwerezak 3381c615ef Adds blue suit jacket to custom loadout gear
Custom item for Nyarlthotep, implemented as custom loadout gear.
2014-12-31 01:00:49 -05:00
Zuhayr 8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr cc00fa3d52 Fixes and tweaks to the previous. 2014-12-23 22:03:02 +10:30
Zuhayr bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
Zuhayr 3de0562dbe Merge resolution. 2014-12-22 23:28:27 +10:30
Zuhayr 32d799e53e Line ending conflict resolution. 2014-12-22 23:27:06 +10:30
Zuhayr 2214837449 Comments out combi-tool, fixes infinite range combitool. 2014-12-16 18:23:21 +10:30
PsiOmega efb6adb452 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-14 00:27:16 +01:00
Zuhayr a79886ec59 Added icons to species select window, changed Sol Common to blue. 2014-12-13 23:55:06 +10:30
Zuhayr a704d1bf94 Merge branch 'languages' of https://github.com/Zuhayr/Baystation12 into dev 2014-12-13 23:13:40 +10:30
Zuhayr d2803ec4d7 Merge resolution. 2014-12-13 23:10:46 +10:30
Zuhayr 7efae862a2 Fixes #7290 2014-12-13 23:04:13 +10:30
PsiOmega b9ce5404d8 Fixes lab coat without icon.
Simply by changing it to the new labcoat variant that can be closed/opened.
Still created a proper definition for the old lab coat, /obj/item/clothing/suit/storage/labcoat, as it's inherited by custom gear.
2014-12-12 14:30:12 +01:00
Zuhayr 0c448de7c9 Added Skrell blurb, also added language/species-based random name generator. 2014-12-11 15:28:26 +10:30
Zuhayr 62c6a4808c Added a link to the whitelist forums in the new species window. 2014-12-11 13:23:40 +10:30
Zuhayr ed29f5ca2b Added a more interesting/informative species selection window to chargen. 2014-12-11 03:49:28 +10:30
mwerezak 81890c968e Adds image for cult talismans
So they aren't blank when examined.
2014-12-08 20:45:15 -05:00
Akai Alonkai 268ec0d36a Implements existing assistant alternate job titles
Adds an option to choose one of the alternate job titles for assistant
already defined at
https://github.com/Baystation12/Baystation12/blob/master/code/game/jobs/job/assistant.dm#L12
2014-12-08 11:12:30 -05:00
mwerezak f752ce2a49 Adds image for cult talismans
So they aren't blank when examined.
2014-12-05 20:56:07 -05:00
SparklySheep f8bc1708af Lowered to 2 points. 2014-11-30 23:20:24 -06:00
SparklySheep 0a43dd0860 Adds pAI cards to the loadout. 2014-11-30 23:12:04 -06:00
Amunak 95032936ce Separated pAI and posibrain candidacy, fixed their jobbans.
You can now toggle special role candidacy for pAIs and Positronic Brains separately. A pAI jobban will now display correctly.  People will be banned from posibrain if they have a jobban on both AI and Cyborg (this is reflected in the character creation GUI as well). Using 'never for this round' on the pAI popup is no longer irreversible.
2014-11-29 00:31:27 +01:00
Amunak 7512246c8b Added toggleable 'chat tags' that can mark different channels in chat.
They are toggleable in the player preferences verb-tab, default is on. They are not necessarily limited to anything, it is just an image in text. The main use is to mark some distinct channels (like OOC, LOOC, admin and mod cheat, dead chat, PMs, ...). To make them more visible, easily distinguishable and perhaps more visually appealing.
2014-11-28 11:15:22 +01:00
Amunak 24798bdc9f Updated my comment to make more sense 2014-11-26 04:26:56 +01:00
Amunak 5a65c85cb0 Moved OOC color definitions to stylesheet:
Removes the unused (and abused) set-player-OOC-colour verb.
Adds definitions for each rank to the stylesheet, moving it from the OOC file.
Updates the OOC-text-color verb accordingly.
Made the custom OOC text color resetable.
Cleaned up hardcoded values, old code and comments.
2014-11-26 04:04:32 +01:00
PsiOmegaDelta c8e00f3e20 Merge pull request #7089 from sabiram/dev
Moves my (sabirm)'s custom item to common loadout pool
2014-11-23 18:08:16 +01:00
PsiOmegaDelta 8e50a32ba8 Merge pull request #7103 from Segrain/dev
Robotic appearances.
2014-11-23 12:05:51 +01:00
Ccomp5950 3ca02037ef Merge pull request #7088 from mwerezak/skrell
Implements skrell changes for Searif
2014-11-22 03:23:41 -05:00
Segrain 078d6f74a5 Robotic flavour texts. 2014-11-21 19:32:40 +03:00
sabiram bdf4905289 I am dumb
It is what it is.
2014-11-20 17:08:24 -05:00
sabiram 5d461f4976 Custom item deleted and added to loadout pool 2014-11-20 16:18:35 -05:00
mwerezak 1751caa64f Adds skrell headtail items 2014-11-20 15:51:52 -05:00
Segrain bec483aa1b Alphabetical sorting. 2014-11-19 19:05:06 +03:00
Segrain c4d95c39f1 Folders, fixes. 2014-11-19 18:42:34 +03:00
Segrain a475247f11 Proper slot equipment. 2014-11-19 18:35:44 +03:00
Chinsky ce3618a200 Merge pull request #6987 from MagmaRam/labcoat
Reworked labcoat buttoning
2014-11-17 04:17:16 +03:00
GinjaNinja32 d10311befd Adds cyborg-only latejoin spawnpoint 2014-11-14 23:38:09 +00:00
MagmaRam 3e5117e3eb All coats that can be buttoned are now subtypes of /obj/item/clothing/suit/storage/toggle
This includes labcoats, IA jackets, first responder jackets, and the brown leather jackets.

This way, code for button toggling doesn't have to be duplicated for labcoats and other coats, and it's easier to add other types of coats that can be buttoned up if someone wants.
2014-11-11 11:27:11 -05:00
Zuhayr b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
Chinsky 13430bd48f Merge pull request #6956 from mwerezak/logo
Fixes #6941
2014-11-07 03:50:08 +03:00
mwerezak 3d7636728c Fixes #6941 2014-11-06 19:34:14 -05:00