Commit Graph

322 Commits

Author SHA1 Message Date
mwerezak
1150902c9f Adds custom item for Von2531
Blue blazer loadout item
2015-03-09 16:57:10 -04:00
Zuhayr
1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +10:30
ccomp5950
ebabf53c6d Staff now have a "re-admin self" button after de-admining themselves.
Stores their admin datum in a deadmin_holder variable in the client, and just moves it back upon re-admining.
2015-03-05 11:05:58 -05:00
Zuhayr
77805bfd05 Merge pull request #8179 from comma/undies
Fixes a sanity check turned insanity check forcing everyone to go commando
2015-02-20 17:01:25 +10:30
Raptor1628
2ae273e1b8 Gear again
Collection of gear and changes from the four gear polls on the forums
includes:
2 new automatic weapons, mapped in to ERT and random weapon spawns.
Laser carbine balance.
Slow emergency softsuits, no armor value other than bio and rad, 4
slowdown.
1 knife, not mapped in, available for Psi's uplink merge.
New vests: 2 types, 2 pocket no slowdown,
4 pocket with slowdown, second is available from cargo and one random
vest
spawn in armory. The first replaces all instances of the old vests. Old
vests still exist in code.
Mercenary vest with no slowdown, 4 pockets, and slightly better armor,
not on map, possibly for Nukes or Traitor Uplink
Holster rearrangement for custom loadout.
Acid dispenser, mapped into robotics and science.
New food items, added to vendors and rations crate.
New random medical spawns, added to medbay.
Cargo and loadout additions to accommodate new items.
1 beanbag loaded 5 round shotgun added to Warden's closet to compensate
for officers having .45 ltls and the HoS having an e-gun, suggested by
IRC and server.

http://baystation12.net/forums/viewtopic.php?f=5&t=12064

http://baystation12.net/forums/viewtopic.php?f=5&t=12031

http://baystation12.net/forums/viewtopic.php?f=5&t=12027

http://baystation12.net/forums/viewtopic.php?f=5&t=12007
2015-02-18 15:35:37 -05:00
Chinsky
cba3448227 Fixes a sanity check turned insanity check forcing everyone to go commando. 2015-02-17 17:01:10 +03:00
Chinsky
3f8462a399 Adds a wardrobe structure to pick your underwear.
Adds ability to wear female underwear as male and vice versa.
Changes 'underwear'/'undershirt' vars to hold iconstate instead of esoteric dances with array indexes.
2015-02-16 11:17:22 +03:00
Zuhayr
be2b0aa6f4 Merge pull request #8135 from Baystation12/master
Master into dev.
2015-02-15 22:03:43 +10:30
GinjaNinja32
9c68bd492d Adds current color as default to hair, facial hair, eye and skin color pickers 2015-02-14 21:49:45 +00:00
Chinsky
30de86c081 Accessories update.
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
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