PsiOmegaDelta
5fbe0819b7
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/Sleeper.dm
2015-08-17 13:05:58 +02:00
PsiOmegaDelta
77d0bbd643
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
PsiOmegaDelta
c63f4c62b5
Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney
...
Conflicts:
code/__defines/mobs.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job_controller.dm
2015-08-13 08:06:11 +02:00
Chinsky
f7ccf47f06
Merge pull request #10030 from GinjaNinja32/languages
...
Reworks character creation language selection
2015-08-13 07:23:44 +03:00
PsiOmega
f8d86900a5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/new_player/preferences_setup.dm
code/setup.dm
2015-08-01 19:45:42 +02:00
Mloc
f04ca77bfb
revert chargen rendering rework
...
fixes #9733
Signed-off-by: Mloc <colmohici@gmail.com >
2015-08-01 11:35:53 +01:00
PsiOmegaDelta
0ba7643217
Updates files as necessary to adhere to the new standard.
2015-07-27 09:32:51 +02:00
PsiOmegaDelta
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
Zuhayr
5e1ae26b74
Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.
2015-07-14 05:19:01 +09:30
GinjaNinja32
57bdcf43b6
Reworks character creation language selection
2015-07-06 10:07:35 +01:00
PsiOmega
f96ad8ca40
NTs relationship towards you now affects the pay grade.
2015-07-02 23:03:55 +02:00
PsiOmegaDelta
00953968dd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-04 08:20:00 +02:00
Chinsky
28c8cd1d81
Fixes #9623
...
Also added a nullcheck for icons to prevent potential client crash.
2015-06-02 13:13:44 +03:00
Zuhayr
958494ae75
Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.
...
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
2015-05-25 14:49:07 +09:30
Chinsky
495783de59
As per Ginja's suggestion, dummies are now used one per prefs datum.
...
Slightly less metal but amount of stuff created/deleted in every human is just too huge.
2015-05-12 07:24:25 +03:00
Chinsky
5c8ceae2fa
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into deaddoll
...
Conflicts:
code/modules/mob/new_player/preferences_setup.dm
2015-05-12 06:04:22 +03:00
Chinsky
29823e3552
Changed update_preview_icon to use a human dolly to get all those icons instead of... old way.
...
I guess it's more hacky, but fairly shorter and means you don't need to touch that... thing when you add a new job/change existing loadout.
Also changed preference transfer to use appearance procs to properly sync with organ colors.
2015-05-12 05:55:49 +03:00
Techhead0
e368c78b42
Fixes rlimb assignment for hands/feet in chargen
...
An easy fix for a small typo that caused rlimbs not to be assigned to
second_limb (hands/feet). I'm surprised the bug went unnoticed this
long.
2015-05-08 21:12:15 -04:00
=
d77010221c
Merge with dev.
2015-03-30 08:36:52 +10:30
Zuhayr
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
Zuhayr
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
volas
e3d41c3112
Merge remote-tracking branch 'upstream/dev' into sanitize_procs
2015-03-25 01:06:32 +03:00
volas
5fee41d4ba
sanitize() refactor: third pass (misc)
2015-03-25 01:05:21 +03:00
Zuhayr
a63b9b4e73
Beginning to port over new icon update from limbs branch. WIP
2015-03-24 23:48:54 +10:30
Zuhayr
b9072baa97
Merge with dev.
2015-03-24 14:41:07 +10:30
PsiOmega
2a17d656f2
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-23 11:47:15 +01:00
PsiOmega
1908ba59e2
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-23 11:45:32 +01:00
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
volas
855755f808
sanitize() refactor: first pass (sanitize)
2015-03-22 23:31:19 +03:00
GinjaNinja32
26d878fb02
Move closing bracket outside <i> tag
...
Opening bracket is outside. Consistency!
2015-03-21 21:08:54 +00:00
Zuhayr
8d698f0c06
First pass on making heist a pirate mode (human based)
2015-03-21 11:13:05 +10:30
GinjaNinja32
04640eafb1
Fix issues with skill class procs
2015-03-20 22:47:51 +00:00
Zuhayr
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
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
GinjaNinja32
9c68bd492d
Adds current color as default to hair, facial hair, eye and skin color pickers
2015-02-14 21:49:45 +00:00
Zuhayr
a41364fbd1
Fixes #7595
2015-01-02 00:00:23 +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
a79886ec59
Added icons to species select window, changed Sol Common to blue.
2014-12-13 23:55:06 +10:30
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
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
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
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
Segrain
078d6f74a5
Robotic flavour texts.
2014-11-21 19:32:40 +03:00
Zuhayr
b4ea25d064
Merge conflict resolution.
2014-11-10 13:00:06 +10:30
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
PsiOmega
322e03dd06
Makes the number of load/storable character slots a configurable value.
2014-10-14 10:05:22 +02:00
