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
08b967c9e0
Move NanoUI cache update to client/New()
2014-10-11 18:40:09 +01:00
37cb78eefa
Fixes #6613 and #6492
2014-10-08 23:10:12 +10:30
431a7474ea
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-07 10:06:17 +10:30
df038c9fe8
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-10-06 20:15:59 +10:30
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
a47ec82103
Merge repair
2014-10-03 16:04:31 -04:00
37b5aa1c50
fixes #6035
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-02 13:26:28 +01:00
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
cc52be3192
Merge resolution, replaced 2 wires lost in map merge.
2014-09-25 23:54:24 +09:30
4e6afd282c
Fixes #6488
2014-09-25 17:59:28 +09:30
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
9f6c22d437
Reapplies LightningIron's fix for #6131
2014-09-02 10:02:37 +09:30
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
89b29eb0f0
One can now save exploitable information about the character, potentially to be used by antags.
2014-08-31 21:31:10 +02:00
7b366f092d
Fixes some issues with new Hydro.
2014-08-27 22:04:19 +09:30
ddf860fb13
Update preferences.dm
...
Fixing a merge error.
2014-08-27 20:56:05 +09:30
772715f2da
Merged dev-freeze into master. Two map conflicts, used dev-freeze map.
2014-08-27 20:46:04 +09:30
cf68ad7c87
Master to dev merge.
2014-08-27 20:24:07 +09:30
39182f0c8f
Fix for #6131 .
2014-08-23 11:19:15 -05:00
6a44883afb
Fixes #6038 . Adds a missing '
2014-08-21 21:52:59 +02:00
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
a3848871d4
fixes #6007 and future bugs with gear names
2014-08-15 11:11:13 +02:00
94ec887a75
removes unused AI text2speech files and code,
...
saves about 4.5 MB traffic per client.
2014-08-13 11:24:23 +02:00
beaad5a37b
Merged in preferences file changes, changed None to Unset for home system.
2014-08-11 10:38:01 +09:30
00fcfa7899
Makes it possible to setup pAI configuration from the character setup screen.
2014-08-08 13:31:52 +02:00
8568a6aa89
Explicit proc/Topic definitions.
2014-08-08 13:21:51 +02:00
9eefdf4db8
A bit of prep work for integegrating player-set backgrounds into gameplay.
2014-08-01 22:54:57 +09:30
1bd8b7baf0
Added citizenship, faction, religion and home system to character generation.
2014-08-01 22:05:38 +09:30
ad8ef7c4ab
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-28 20:59:29 +09:30
0a0c18dbf6
Fixed issue with flavour text saving/loading from other characters
2014-07-26 18:50:34 -07:00
5fe8865f95
Merge pull request #5771 from JimTheCactus/name_fix
...
Added check for blank on name entry
2014-07-27 05:04:05 +04:00
eb64769734
Cleaned up mistake implementing dynamic flavour text
2014-07-26 17:41:03 -07:00
8f1417f14c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext
2014-07-26 17:09:12 -07:00
0528675846
Added dynamic flavour text, where covered bodyparts' flavour isn't displayed
2014-07-26 17:08:55 -07:00
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
d4ce124fe0
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix
2014-07-25 19:37:10 -07:00
9be6de1e77
fixes admin show-skills verb.
2014-07-25 19:34:13 -07:00
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
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
2c7bb6c48d
Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request.
2014-07-24 17:01:52 -07:00
f8d478fcbb
Updates to gun targeting UI. Fixes #5710
2014-07-23 20:51:58 -07:00
6981ca52f4
Trying to fix the loadout spawn issue, at least this will make it more informative.
2014-07-12 10:35:31 +09:30
3955edd04b
Final touches for loadout system.
2014-07-11 12:16:08 +09:30
903679bd79
More work on gear loadouts.
2014-07-11 11:47:53 +09:30
85b1bbe041
Merging work into dev.
2014-07-10 20:25:07 +09:30
d389466c8a
Fix Change UI verb
2014-07-05 21:28:11 +01:00
4367d37332
Somehow when I added spawnpoints I put them in the wrong place. Moved the file.
2014-07-01 01:04:19 +09:30
19bb5014a9
More work on custom gear.
2014-06-29 04:22:09 +09:30
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