Commit Graph

683 Commits

Author SHA1 Message Date
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
Walter0o 3c1780a301 fixes robo- and amputated limbs not working on spawn
i pulled in some patches from upstream today, then my players reported
robotic and amputated limbs are not appearing on spawn.
not exactly sure what happened here, but it looks like
somebody tried to fix one issue and created a bigger one.
organs are never in both organs_by_name and internal_organs_by_name,
so the flag setters became unreachable due to "if(!I || !O) continue"
2014-11-04 20:33:43 +01:00
mwerezak 6ac3c4c359 More custom loadout jackets + bandana
Adds custom loadout gear:
Searif's brown leather jacket, NT brown leather jacket, and grey hoodie.
Also brings back the orange bandana, and adjusts some siemens
coefficient values that weren't making sense.
2014-11-02 22:51:33 -05:00
mwerezak 7e2e44a61a Adds Searif's leather jackets as a custom gear 2014-11-01 23:12:21 -04:00
mwerezak a9399c2b79 Custom loadout updates
Adds sorting to the custom gear menu list.
Adds the white cheongsam as a custom gear item.
Moves the purple comb out of the custom item defines as it is no longer
just a custom item.
Adds pockets to the bomber jacket.
Reduces the cost of ponchos to 3.
2014-11-01 15:56:11 -04:00
Mloc-Argent 119e0a89ff webclient support
no cid checks, not supported properly on webclient

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-11-01 16:17:23 +00:00
Chinsky 3887ada4a4 Merge pull request #6866 from PsiOmegaDelta/Bomber
Most minor spelling correction.
2014-10-29 06:31:11 +03:00
mwerezak b8805a493f Adds two new poncho types, adjusts bomber jacket cold protection
Adjusted the cold protection so it might actually be noticable now, forgot earlier that it was mitigated by uncovered areas.
2014-10-28 21:05:58 -04:00
PsiOmega 4eb4869205 Most minor spelling correction. 2014-10-27 23:09:16 +01:00
Chinsky 3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm
2014-10-20 04:52:45 +04:00
Chinsky 02a5226b8a Merge pull request #6772 from Zuhayr/master
Fixes
2014-10-19 01:42:36 +04:00
GinjaNinja32 e6c7713e02 Fix intent switching using Change-UI 2014-10-18 16:29:05 +01:00
Zuhayr e7e50e9f51 Fixes #6745 2014-10-18 07:57:18 +10:30
Chinsky 1e8222c14f Merge pull request #6750 from Baystation12/dev-freeze
Dev freeze -> Dev
2014-10-16 20:07:35 +04:00
Zuhayr 835e7b20c1 Possible fix for #6729 2014-10-16 14:16:44 +10:30
PsiOmega 322e03dd06 Makes the number of load/storable character slots a configurable value. 2014-10-14 10:05:22 +02:00
Zuhayr 6d1fd2886b Added goddamn atrocious wig for Earthcrusher. 2014-10-12 11:58:58 +10:30
Zuhayr 5989a0c625 Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it. 2014-10-12 11:48:54 +10:30
GinjaNinja32 08b967c9e0 Move NanoUI cache update to client/New() 2014-10-11 18:40:09 +01:00
Zuhayr 37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Zuhayr 431a7474ea Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-07 10:06:17 +10:30
Zuhayr df038c9fe8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-06 20:15:59 +10:30
Mloc 056fbd79d1 fixes #6599
also small improvements to the loadout system

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-06 09:57:01 +01:00
Gamerofthegame a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
Mloc 37b5aa1c50 fixes #6035
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-02 13:26:28 +01:00
Zuhayr 223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr cc52be3192 Merge resolution, replaced 2 wires lost in map merge. 2014-09-25 23:54:24 +09:30
Zuhayr 4e6afd282c Fixes #6488 2014-09-25 17:59:28 +09:30
Zuhayr 0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Zuhayr 9f6c22d437 Reapplies LightningIron's fix for #6131 2014-09-02 10:02:37 +09:30