Commit Graph

21962 Commits

Author SHA1 Message Date
SinTwo
43736e8e3d Quick Shorts Fix
Just a quick path fix for icons.
2015-12-31 20:20:18 -05:00
Zuhayr
b65649faad May fix massive lag issues with autofire guns. 2016-01-01 11:29:50 +10:30
Neerti
c6948586db Merge pull request #710 from Zuhayr/polfix
Cleaning up some holder/scoop/climbing code.
2015-12-31 19:30:06 -05:00
Zuhayr
e3735bfbee Cleaning up some holder/scoop/climbing code. 2016-01-01 10:30:05 +10:30
SinTwo
3eb9bfb45c PDA Update Fix. 2015-12-31 18:22:47 -05:00
SinTwo
b0916167c0 Adds new PDA sprites. 2015-12-31 15:19:11 -05:00
Hubblenaut
75c78fc3c9 Changes to Confused Moving 2015-12-31 02:28:35 +01:00
Yoshax
e2388e06d9 Updates terminology 2015-12-31 01:00:05 +00:00
Chinsky
7ad106349c Merge pull request #11749 from headswe/soulstone_fix
Fixes #11711 & Refractors soulstone.dm
2015-12-31 00:36:14 +03:00
Yoshax
9da04751ef Removes actually seen mentions of the word retard 2015-12-30 19:52:57 +00:00
PsiOmegaDelta
059d9cd131 Re-fixes skin tone not displaying the proper value when being edited in the character setup. 2015-12-30 16:29:41 +01:00
PsiOmegaDelta
cacdb48863 Can now load/save/reload while readied.
The load window also no longer pops under the character setup screen.
Just some small character preference QoL changes.
2015-12-30 16:29:35 +01:00
PsiOmegaDelta
dbe840b32e Merge pull request #11811 from Baystation12/master
Dev-freeze.
2015-12-29 14:13:28 +01:00
Zuhayr
4456a8c424 Added gear harnesses to the loadout. 2015-12-29 21:26:06 +10:30
GinjaNinja32
d3d9a79cd0 fix logging, fix commented-out code and explain comment 2015-12-29 06:49:18 +00:00
Neerti
59c1773286 Merge pull request #687 from Datraen/EAL-Speaker-Tweak
EAL given to Cyborgs, AI and pAI.
2015-12-28 23:47:41 -05:00
Datraen
48d0d6bb39 EAL given to Cyborgs, AI and pAI. 2015-12-28 20:32:41 -05:00
GinjaNinja32
3dfb821eed add revision topic call 2015-12-28 17:25:37 +00:00
PsiOmegaDelta
949d3d0c7f Merge pull request #11770 from Baystation12/master
Dev-feeeze
2015-12-28 16:32:46 +01:00
ccomp5950
8614484408 Hidden doors when open can be seen through.
Fixes #11765
2015-12-27 19:17:21 -05:00
Sebastian Broberg
14393ea706 Few refraction 2015-12-27 17:05:08 +01:00
PsiOmegaDelta
45a55db766 Merge pull request #11761 from Baystation12/master
Dev-freeze
2015-12-27 16:04:26 +01:00
Zuhayr
1617a43685 Applying Harpy's prosthetic limb damage fix. 2015-12-27 17:27:19 +10:30
mwerezak
8b685fdf8f Fixes #11380 2015-12-27 01:39:34 -05:00
mwerezak
b30f81c7ea Fixes #11381 2015-12-27 01:28:41 -05:00
Neerti
39bb0acd42 Merge pull request #570 from GinjaNinja32/pl-chemistry
revert chemical dispenser revert
2015-12-26 19:47:25 -05:00
Chinsky
976666dcc9 Merge pull request #11747 from PsiOmegaDelta/151224-ByeByeForeverClown
Fixes #11745.
2015-12-26 19:24:47 +03:00
PsiOmegaDelta
da0a4c47cf Merge pull request #11756 from Baystation12/master
Dev-freeze
2015-12-26 11:58:42 +01:00
Zuhayr
4169bac4cb Merge pull request #11754 from PsiOmegaDelta/151225-StackThoseCablesRightHereRightNow
Can now join compatible cable coils of any type.
2015-12-26 18:23:43 +10:30
Zuhayr
77d386f199 Fix for brains ending up popping out of cryo consoles. 2015-12-26 17:06:53 +10:30
Sebastian Broberg
370529bc42 Refractored soulstone.dm
Split the various functions of the proc into multiple procs
Moved the transfer_soul proc under the soulstone object.
2015-12-25 13:04:13 +01:00
Sebastian Broberg
b000ca4eb7 Boop, logic escaped me also refractor this shit someone. 2015-12-25 11:30:33 +01:00
PsiOmegaDelta
faec92b553 Can now join compatible cable coils of any type.
Partial backport of #11656. Fixes #10935.
2015-12-25 11:19:59 +01:00
GinjaNinja32
7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
Zuhayr
d5124057fe Merge pull request #11751 from GinjaNinja32/master-examine
fix human examine gender
2015-12-25 14:05:06 +10:30
GinjaNinja32
04006f5b9e fix human examine gender 2015-12-25 01:06:35 +00:00
GinjaNinja32
34b8c99d52 backport fix for #10705 from dev
fix #10705
2015-12-25 00:56:16 +00:00
Zuhayr
9f729aad0c Fixed weapon use by borgs. 2015-12-25 09:33:07 +10:30
Zuhayr
9df402b0de Fixes issues with burn repair surgery for robolimbs. 2015-12-25 08:50:58 +10:30
Sebastian Broberg
ebef6272b9 Fixes #11711
Should fix it.
2015-12-24 23:02:37 +01:00
PsiOmegaDelta
b0aa56089e Fixes #11745. 2015-12-24 19:11:32 +01:00
PsiOmegaDelta
6617ab6bf9 Merge pull request #11744 from Ccomp5950/fix_ai_malf_dualism
AI Malf will no longer be able to spawn a non-antag AI
2015-12-24 19:10:34 +01:00
ccomp5950
ccda750ee1 AI Malf will no longer be able to spawn a non-antag AI
fixes #10554
2015-12-24 12:26:56 -05:00
GinjaNinja32
9dee0707e8 Merge remote-tracking branch 'polaris/master' into pl-chemistry 2015-12-24 15:06:16 +00:00
Neerti
084ba448fa Merge pull request #652 from Zuhayr/nerf
Added Nerf weapons to Cargo.
2015-12-24 06:47:48 -05:00
Zuhayr
e555c8432f Merge pull request #640 from Neerti/12/21/2015_event_tweaks
Random Event Tweaks
2015-12-24 22:11:19 +10:30
Zuhayr
5313c6b67b Added Nerf weapons to Cargo. Codersprites. 2015-12-24 22:05:10 +10:30
Zuhayr
8602f07d31 Allowed grenades to be stuffed into mouths and primed. 2015-12-24 21:55:05 +10:30
Zuhayr
f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
NullSnapshot
87afd2feb2 Fixes: #11351 #11357 #11359 #11361 2015-12-24 21:10:41 +10:30