Commit Graph

318 Commits

Author SHA1 Message Date
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
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
PsiOmega
9e4b7ed265 Preliminary support for the new general information. Renames the exploit record to permanent record.
The new general information being:
Home system
Citizenship
Faction
Religion

Still to be made available in employment/security/medical records as applicable.
2014-09-01 14:45:47 +02:00
PsiOmega
89b29eb0f0 One can now save exploitable information about the character, potentially to be used by antags. 2014-08-31 21:31:10 +02:00
Zuhayr
7b366f092d Fixes some issues with new Hydro. 2014-08-27 22:04:19 +09:30
Zuhayr
ddf860fb13 Update preferences.dm
Fixing a merge error.
2014-08-27 20:56:05 +09:30
Zuhayr
772715f2da Merged dev-freeze into master. Two map conflicts, used dev-freeze map. 2014-08-27 20:46:04 +09:30
Zuhayr
cf68ad7c87 Master to dev merge. 2014-08-27 20:24:07 +09:30
LightningIron
39182f0c8f Fix for #6131. 2014-08-23 11:19:15 -05:00
PsiOmega
6a44883afb Fixes #6038. Adds a missing ' 2014-08-21 21:52:59 +02:00
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Walter0o
a3848871d4 fixes #6007 and future bugs with gear names 2014-08-15 11:11:13 +02:00
Zuhayr
beaad5a37b Merged in preferences file changes, changed None to Unset for home system. 2014-08-11 10:38:01 +09:30
PsiOmega
00fcfa7899 Makes it possible to setup pAI configuration from the character setup screen. 2014-08-08 13:31:52 +02:00
PsiOmega
8568a6aa89 Explicit proc/Topic definitions. 2014-08-08 13:21:51 +02:00
Zuhayr
1bd8b7baf0 Added citizenship, faction, religion and home system to character generation. 2014-08-01 22:05:38 +09:30
Zuhayr
ad8ef7c4ab Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-28 20:59:29 +09:30
Chinsky
5fe8865f95 Merge pull request #5771 from JimTheCactus/name_fix
Added check for blank on name entry
2014-07-27 05:04:05 +04:00
Whitellama
eb64769734 Cleaned up mistake implementing dynamic flavour text 2014-07-26 17:41:03 -07:00
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
0528675846 Added dynamic flavour text, where covered bodyparts' flavour isn't displayed 2014-07-26 17:08:55 -07:00
JimTheCactus
0b7e858000 Changes check to an isnull rather than a truth test
This allows the client to detect the difference between a blank and someone pressing cancel.
2014-07-26 16:19:14 -06:00
DJSnapshot
d4ce124fe0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix 2014-07-25 19:37:10 -07:00
DJSnapshot
9be6de1e77 fixes admin show-skills verb. 2014-07-25 19:34:13 -07:00
JimTheCactus
b0db2ba347 Added check for blank on name entry
Since cancel just returns a blank this checks for that and doesn't raise an error.
2014-07-25 19:36:58 -06:00
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/client/preferences.dm
2014-07-25 17:19:59 -07:00
DJSnapshot
2c7bb6c48d Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request. 2014-07-24 17:01:52 -07:00
Zuhayr
903679bd79 More work on gear loadouts. 2014-07-11 11:47:53 +09:30
Zuhayr
85b1bbe041 Merging work into dev. 2014-07-10 20:25:07 +09:30
Zuhayr
19bb5014a9 More work on custom gear. 2014-06-29 04:22:09 +09:30
mwerezak
03648c220e Adds workaround for PHP whitelist
Apparently there's some PHP script that needs to be updated or
something. Revert this once that is done.
2014-06-28 12:19:57 -04:00
Zuhayr
515e78f760 First pass on custom loadouts. 2014-06-25 15:47:38 +09:30
Zuhayr
abc07e435c Minor formatting fix. 2014-06-24 13:41:59 +09:30
Zuhayr
96bbe1d9db Added spawnpoint datum, moved existing latejoin spawn to datum setup. 2014-06-24 13:33:48 +09:30
Hubblenaut
1e09995f63 Wheelchairs spawn on footless characters 2014-06-05 22:50:42 -04:00
Jeremy Liberman
d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Ccomp5950
0ca4aaa316 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-05-24 19:03:51 -05:00
Ccomp5950
ff0d667337 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2014-05-24 19:02:16 -05:00
mwerezak
87dfeab0f3 Adds secondary languages for species 2014-05-22 16:17:52 -04:00
Chinsky
5b761f5207 Merge pull request #5011 from DJSnapshot/hotfix
Forgot I would need a null check.
2014-05-17 08:29:16 +04:00
DJSnapshot
56e3d0a37f Forgot I would need a null check. 2014-05-16 21:26:08 -07:00
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
Mloc-Argent
2d99a65cdf Merge remote-tracking branch 'upstream/master' into dev 2014-05-08 19:27:02 +01:00
Ccomp5950
1f6ec81e40 Jobs you can't select are struckthrough instead of just being red.
Before:  It's going to be kinda confusing when a new player goes to setup their jobs and they see this: http://i.imgur.com/miK9Isk.png
Specifically "unavailable occupations are in red" and then a list of days till they can play that role but also RED [NEVER] which to a new player migth cause confusion thinking
they can never play that role.

After:  Remove the red and add a strikethrough ( http://i.imgur.com/BQ90xr6.png  ) to show "these jobs are unavailable" while making the other jobs look, well more available.
2014-05-08 01:05:12 -05:00
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Intercross21
d4ee83666e Now AH shows key, prefs.jobs not have scrollbar, prefs is fully visible except undo/save menus. 2014-05-04 19:41:14 +04:00
Intercross21
02ce933297 Larger job and preferences windows but still lesser than 764. More choices in "Quick Create Object" menu. 2014-05-04 18:11:11 +04:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-03 16:56:19 +01:00